Merge pull request #661 from RWTH-EBC/issue612_co2Model

Issue612 co2 model
RWTH-EBC · Nov 24, 2020 · b08a692 · b08a692
2 parents a7242b7 + ae5ede8
commit b08a692
Show file tree

Hide file tree

Showing 30 changed files with 232 additions and 191 deletions.
diff --git a/teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone b/teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone
@@ -3,25 +3,8 @@ within ${bldg.parent.name}.${bldg.name};
 model ${bldg.name}
   "This is the simulation model of ${bldg.name} with traceable ID ${bldg.building_id}"
 
-% if bldg.internal_gains_mode==1 or bldg.internal_gains_mode==2:
-  AixLib.ThermalZones.ReducedOrder.Multizone.MultizoneEquipped multizone(
-    redeclare package Medium = Modelica.Media.Air.SimpleAir,
-    buildingID=${bldg.building_id},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start = ${bldg.thermal_zones[0].t_inside},
-    VAir = ${bldg.volume},
-    ABuilding=${bldg.net_leased_area},
-    ASurTot=${bldg.library_attr.total_surface_area},
-    numZones = ${len(bldg.thermal_zones)},
-    internalGainsMode = ${bldg.internal_gains_mode},
-    zoneParam = {
-      %for zone in bldg.thermal_zones:
-      ${bldg.name}_DataBase.${bldg.name}_${zone.name}()${',' if not loop.last else ''}
-      %endfor
-      },
-%else:
-  AixLib.ThermalZones.ReducedOrder.Multizone.MultizoneMoistAirEquipped multizone(
-    redeclare package Medium = AixLib.Media.Air,
+
+AixLib.ThermalZones.ReducedOrder.Multizone.MultizoneEquipped multizone(
     buildingID=${bldg.building_id},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     T_start = ${bldg.thermal_zones[0].t_inside},
@@ -30,12 +13,20 @@ model ${bldg.name}
     ASurTot=${bldg.library_attr.total_surface_area},
     numZones = ${len(bldg.thermal_zones)},
     internalGainsMode = ${bldg.internal_gains_mode},
+    % if bldg.internal_gains_mode==3:
+        use_C_flow = true,
+        use_moisture_balance = true,
+        redeclare package Medium = AixLib.Media.Air(extraPropertiesNames={"C_flow"}),
+    % else:
+        use_C_flow = false,
+        use_moisture_balance = false,
+        redeclare package Medium = Modelica.Media.Air.SimpleAir,
+    % endif
     zoneParam = {
       %for zone in bldg.thermal_zones:
       ${bldg.name}_DataBase.${bldg.name}_${zone.name}()${',' if not loop.last else ''}
       %endfor
       },
-% endif
 % if bldg.with_ahu:
   heatAHU=${get_true_false(bldg.central_ahu.heating)},
   coolAHU=${get_true_false(bldg.central_ahu.cooling)},
@@ -69,13 +60,6 @@ model ${bldg.name}
            intWallRC(thermCapInt(each der_T(fixed=true))),floorRC
            (thermCapExt(each der_T(fixed=true))),roofRC(thermCapExt(each
            der_T(fixed=true))))),
-% if bldg.internal_gains_mode==1 or bldg.internal_gains_mode==2:
-   redeclare model thermalZone =
-        AixLib.ThermalZones.ReducedOrder.ThermalZone.ThermalZoneAirExchange,
-% else:
-   redeclare model thermalZone =
-        AixLib.ThermalZones.ReducedOrder.ThermalZone.ThermalZoneMoistAirExchange,
-% endif
    redeclare model corG =
         AixLib.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane,
 % if bldg.central_ahu:

diff --git a/teaser/examples/e9_building_data_import_from_excel.py b/teaser/examples/e9_building_data_import_from_excel.py
@@ -311,6 +311,7 @@ def warn_constructiontype(element):
     bldg = Building(parent=project)
     bldg.name = building_name
     bldg.year_of_construction = construction_age
+    bldg.internal_gains_mode = 3  # HardCodedInput
     bldg.with_ahu = True  # HardCodedInput
     if bldg.with_ahu is True:
         bldg.central_ahu.heat_recovery = True  # HardCodedInput

diff --git a/teaser/logic/archetypebuildings/bmvbs/custom/institute.py b/teaser/logic/archetypebuildings/bmvbs/custom/institute.py
@@ -55,14 +55,16 @@ class Institute(Office):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     office_layout : int
         Structure of the floor plan of office buildings, default is 1,
         which is representative for one elongated floor.

diff --git a/teaser/logic/archetypebuildings/bmvbs/custom/institute4.py b/teaser/logic/archetypebuildings/bmvbs/custom/institute4.py
@@ -56,14 +56,16 @@ class Institute4(Office):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     office_layout : int
         Structure of the floor plan of office buildings, default is 1,
         which is representative for one elongated floor.

diff --git a/teaser/logic/archetypebuildings/bmvbs/custom/institute8.py b/teaser/logic/archetypebuildings/bmvbs/custom/institute8.py
@@ -56,14 +56,16 @@ class Institute8(Office):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015), the co2 calculation is based on
+           Engineering ToolBox (2004)
     office_layout : int
         Structure of the floor plan of office buildings, default is 1,
         which is representative for one elongated floor.

diff --git a/teaser/logic/archetypebuildings/bmvbs/office.py b/teaser/logic/archetypebuildings/bmvbs/office.py
@@ -73,14 +73,16 @@ class Office(NonResidential):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     office_layout : int
         Structure of the floor plan of office buildings, default is 1,
         which is representative for one elongated floor.

diff --git a/teaser/logic/archetypebuildings/bmvbs/singlefamilydwelling.py b/teaser/logic/archetypebuildings/bmvbs/singlefamilydwelling.py
@@ -58,14 +58,16 @@ class SingleFamilyDwelling(Residential):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015), the co2 calculation is based on
+           Engineering ToolBox (2004)
     residential_layout : int
         Structure of floor plan (default = 0)
             0: compact

diff --git a/teaser/logic/archetypebuildings/nonresidential.py b/teaser/logic/archetypebuildings/nonresidential.py
@@ -35,14 +35,16 @@ class NonResidential(Building):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
 
     Attributes
     ----------

diff --git a/teaser/logic/archetypebuildings/residential.py b/teaser/logic/archetypebuildings/residential.py
@@ -35,14 +35,16 @@ class Residential(Building):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     Attributes
     ----------
     central_ahu : instance of BuildingAHU

diff --git a/teaser/logic/archetypebuildings/tabula/de/apartmentblock.py b/teaser/logic/archetypebuildings/tabula/de/apartmentblock.py
@@ -47,14 +47,16 @@ class ApartmentBlock(SingleFamilyHouse):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     construction_type : str
         Construction type of used wall constructions default is "existing
         state"

diff --git a/teaser/logic/archetypebuildings/tabula/de/multifamilyhouse.py b/teaser/logic/archetypebuildings/tabula/de/multifamilyhouse.py
@@ -47,14 +47,16 @@ class MultiFamilyHouse(SingleFamilyHouse):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     construction_type : str
         Construction type of used wall constructions default is "existing
         state"

diff --git a/teaser/logic/archetypebuildings/tabula/de/singlefamilyhouse.py b/teaser/logic/archetypebuildings/tabula/de/singlefamilyhouse.py
@@ -76,14 +76,16 @@ class has exactly one usage zone, which is 'Living'. TABULA also does not
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     construction_type : str
         Construction type of used wall constructions default is "existing
         state"

diff --git a/teaser/logic/archetypebuildings/tabula/de/terracedhouse.py b/teaser/logic/archetypebuildings/tabula/de/terracedhouse.py
@@ -47,14 +47,16 @@ class TerracedHouse(SingleFamilyHouse):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     construction_type : str
         Construction type of used wall constructions default is "existing
         state"

diff --git a/teaser/logic/archetypebuildings/tabula/dk/apartmentblock.py b/teaser/logic/archetypebuildings/tabula/dk/apartmentblock.py
@@ -47,14 +47,16 @@ class ApartmentBlock(SingleFamilyHouse):
         assigned to attribute central_ahu. This instance holds information for
         central Air Handling units. Default is False.
     internal_gains_mode: int [1, 2, 3]
-        mode for the internal gains calculation by persons:
-        1: Temperature and activity degree dependent calculation. The
+        mode for the internal gains calculation done in AixLib:
+        1: Temperature and activity degree dependent heat flux calculation for persons. The
            calculation is based on  SIA 2024 (default)
-        2: Temperature and activity degree independent calculation, the max.
+        2: Temperature and activity degree independent heat flux calculation for persons, the max.
            heatflowrate is prescribed by the parameter
            fixed_heat_flow_rate_persons.
         3: Temperature and activity degree dependent calculation with
-           consideration of moisture. The calculation is based on SIA 2024
+           consideration of moisture and co2. The moisture calculation is
+           based on SIA 2024 (2015) and regards persons and non-persons, the co2 calculation is based on
+           Engineering ToolBox (2004) and regards only persons.
     construction_type : str
         Construction type of used wall constructions default is "existing
         state"