fix for new BESMod user profile

Author: HvanderStok

teaser/data/output/besmod_output.py

@@ -404,25 +404,25 @@ def _convert_heating_profile(heating_profile):
             change_count += 1
             change_indexes.append(i)
     t_set_zone_nominal = max(heating_profile)
-    amplitude = min(heating_profile) - t_set_zone_nominal
+    amplitude = abs(min(heating_profile) - t_set_zone_nominal)
     if change_count == 0:
         amplitude = 0
         start_time = 0
         width = 1e-50
     elif change_count == 1:
         if heating_profile[0] < heating_profile[-1]:
             start_time = 0
-            width = 100 * change_indexes[0] / 24
+            width = change_indexes[0]
         else:
             start_time = change_indexes[0] * 3600
-            width = 100 * (24 - change_indexes[0]) / 24
+            width = (24 - change_indexes[0])
     elif change_count == 2:
         start_time = change_indexes[1] * 3600
-        width = 100 * (24 - change_indexes[1] + change_indexes[0]) / 24
+        width = (24 - change_indexes[1] + change_indexes[0])
     else:
         raise ValueError("You have more than two temperature intervals in the heating profile."
                          "BESMod can only handel one heating set back.")
-    return t_set_zone_nominal, start_time, width, amplitude
+    return t_set_zone_nominal, start_time, width * 3600, amplitude
 
 
 def _get_next_higher_year_value(years_dict, given_year):

teaser/data/output/modelicatemplate/BESMod/Example_GasBoilerBuildingOnly

@@ -5,10 +5,10 @@ model GasBoilerBuildingOnly${bldg.name}
     redeclare ${bldg.name} building,
     userProfiles(fileNameIntGains=Modelica.Utilities.Files.loadResource(
         "modelica://${bldg.parent.name}/${bldg.name}/InternalGains_${bldg.name}.txt"),
-        setBakTSetZone(
-            amplitude=${get_list(setBakTSetZone_amplitude)},
-            width=${get_list(setBakTSetZone_width)},
-            startTime=${get_list(setBakTSetZone_startTime)})),
+        nigSetBack(
+            dTSetBack=${get_list(setBakTSetZone_amplitude)},
+            timeSetBack=${get_list(setBakTSetZone_width)},
+            startTimeSetBack=${get_list(setBakTSetZone_startTime)})),
     systemParameters(nZones=${len(bldg.thermal_zones)},
                      TSetZone_nominal=${get_list(TSetZone_nominal)},
                      TOda_nominal=${TOda_nominal},

teaser/data/output/modelicatemplate/BESMod/Example_HeatPumpMonoenergetic

@@ -7,10 +7,10 @@ model HeatPumpMonoenergetic${bldg.name}
       energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
     userProfiles(fileNameIntGains=Modelica.Utilities.Files.loadResource(
       "modelica://${bldg.parent.name}/${bldg.name}/InternalGains_${bldg.name}.txt"),
-      setBakTSetZone(
-        amplitude=${get_list(setBakTSetZone_amplitude)},
-        width=${get_list(setBakTSetZone_width)},
-        startTime=${get_list(setBakTSetZone_startTime)})),
+      nigSetBack(
+            dTSetBack=${get_list(setBakTSetZone_amplitude)},
+            timeSetBack=${get_list(setBakTSetZone_width)},
+            startTimeSetBack=${get_list(setBakTSetZone_startTime)})),
     systemParameters(
         nZones=${len(bldg.thermal_zones)},
         TSetZone_nominal=${get_list(TSetZone_nominal)},

teaser/data/output/modelicatemplate/BESMod/Example_TEASERHeatLoadCalculation

@@ -6,10 +6,10 @@ model TEASERHeatLoadCalculation${bldg.name}
     userProfiles(
         fileNameIntGains=Modelica.Utilities.Files.loadResource(
         "modelica://${bldg.parent.name}/${bldg.name}/InternalGains_${bldg.name}.txt"),
-        setBakTSetZone(
-            amplitude=${get_list(setBakTSetZone_amplitude)},
-            width=${get_list(setBakTSetZone_width)},
-            startTime=${get_list(setBakTSetZone_startTime)})),
+        nigSetBack(
+            dTSetBack=${get_list(setBakTSetZone_amplitude)},
+            timeSetBack=${get_list(setBakTSetZone_width)},
+            startTimeSetBack=${get_list(setBakTSetZone_startTime)})),
     systemParameters(nZones=${len(bldg.thermal_zones)},
                      TSetZone_nominal=${get_list(TSetZone_nominal)},
                      TOda_nominal=${TOda_nominal},

teaser/examples/e11_export_besmod_models.py

@@ -151,9 +151,9 @@ def example_export_besmod():
     #       redeclare BESMod.Systems.UserProfiles.TEASERProfiles
     #       userProfiles(fileNameIntGains=Modelica.Utilities.Files.loadResource(
     #               "modelica://${bldg.parent.name}/${bldg.name}/InternalGains_${bldg.name}.txt"),
-    #                setBakTSetZone(amplitude=${get_list(setBakTSetZone_amplitude)},
-    #                               width =${get_list(setBakTSetZone_width)},
-    #                               startTime =${get_list(setBakTSetZone_startTime)})),
+    #                dTSetBack=${get_list(setBakTSetZone_amplitude)},
+    #                hoursSetBack=${get_list(setBakTSetZone_width)},
+    #                startTimeSetBack=${get_list(setBakTSetZone_startTime)}),
     #     systemParameters(nZones=${len(bldg.thermal_zones)},
     #                      QBui_flow_nominal = building.QRec_flow_nominal,
     #                      TOda_nominal =${TOda_nominal},

teaser/logic/buildingobjects/calculation/aixlib.py

@@ -64,8 +64,8 @@ def __init__(self, parent):
         self.file_set_t_cool = "TsetCool_" + self.parent.name + ".txt"
         self.file_ahu = "AHU_" + self.parent.name + ".txt"
         self.file_internal_gains = "InternalGains_" + self.parent.name + ".txt"
-        self.version = "2.1.1"
-        self.besmod_version = "0.6.0"
+        self.version = "3.0.0"
+        self.besmod_version = "0.7.0"
         self.total_surface_area = None
         self.consider_heat_capacity = True
         self.use_set_back = True