diff --git a/BESMod/Examples/BAUSimStudy/Buildings/package.mo b/BESMod/Examples/BAUSimStudy/Buildings/package.mo
deleted file mode 100644
index 5b5ed39d..00000000
--- a/BESMod/Examples/BAUSimStudy/Buildings/package.mo
+++ /dev/null
@@ -1,3 +0,0 @@
-within BESMod.Examples.BAUSimStudy;
-package Buildings
-end Buildings;
diff --git a/BESMod/Examples/BAUSimStudy/Buildings/package.order b/BESMod/Examples/BAUSimStudy/Buildings/package.order
deleted file mode 100644
index 5e010bde..00000000
--- a/BESMod/Examples/BAUSimStudy/Buildings/package.order
+++ /dev/null
@@ -1,4 +0,0 @@
-Case_1_retrofit
-Case_1_standard
-Case_2_retrofit
-Case_2_standard
diff --git a/BESMod/Examples/BAUSimStudy/Case1Standard.mo b/BESMod/Examples/BAUSimStudy/Case1Standard.mo
index cb34e7c4..2bca4693 100644
--- a/BESMod/Examples/BAUSimStudy/Case1Standard.mo
+++ b/BESMod/Examples/BAUSimStudy/Case1Standard.mo
@@ -1,8 +1,9 @@
within BESMod.Examples.BAUSimStudy;
model Case1Standard
- extends PartialCase(building(redeclare Buildings.Case_1_standard oneZoneParam(
- heaLoadFacGrd=0, heaLoadFacOut=0)),
- systemParameters(QBui_flow_nominal={16308.1}, TOda_nominal=263.15, THydSup_nominal={328.15}));
+ extends PartialCase(building(redeclare
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.NoRetrofit1918_SingleDwelling
+ oneZoneParam),
+ systemParameters(TOda_nominal=263.15, THydSup_nominal={328.15}));
extends Modelica.Icons.Example;
annotation (experiment(StopTime=172800,
diff --git a/BESMod/Examples/BAUSimStudy/PartialCase.mo b/BESMod/Examples/BAUSimStudy/PartialCase.mo
index 4bf58b54..cf853a6c 100644
--- a/BESMod/Examples/BAUSimStudy/PartialCase.mo
+++ b/BESMod/Examples/BAUSimStudy/PartialCase.mo
@@ -3,10 +3,9 @@ partial model PartialCase
extends Systems.BaseClasses.PartialBuildingEnergySystem(
redeclare BESMod.Systems.Electrical.DirectGridConnectionSystem electrical,
redeclare Systems.Demand.Building.TEASERThermalZone building(
- redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
hBui=sum(building.zoneParam.VAir)^(1/3),
ABui=sum(building.zoneParam.VAir)^(2/3),
+ ARoo=sum(building.zoneParam.ARoof),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
@@ -88,7 +87,7 @@ partial model PartialCase
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
- redeclare BESParameters systemParameters,
+ redeclare BESParameters systemParameters(QBui_flow_nominal=building.QRec_flow_nominal),
redeclare BESMod.Systems.RecordsCollection.ParameterStudy.NoStudy
parameterStudy,
redeclare final package MediumDHW = AixLib.Media.Water,
diff --git a/BESMod/Examples/BAUSimStudy/package.order b/BESMod/Examples/BAUSimStudy/package.order
index e947a511..c3bf2225 100644
--- a/BESMod/Examples/BAUSimStudy/package.order
+++ b/BESMod/Examples/BAUSimStudy/package.order
@@ -1,4 +1,3 @@
Case1Standard
PartialCase
BESParameters
-Buildings
diff --git a/BESMod/Examples/DesignOptimization/BES.mo b/BESMod/Examples/DesignOptimization/BES.mo
index 8cbaf964..5a8ba941 100644
--- a/BESMod/Examples/DesignOptimization/BES.mo
+++ b/BESMod/Examples/DesignOptimization/BES.mo
@@ -7,7 +7,7 @@ model BES
hBui=sum(building.zoneParam.VAir)^(1/3),
ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
+ oneZoneParam,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
diff --git a/BESMod/Examples/DesignOptimization/BESNoDHW.mo b/BESMod/Examples/DesignOptimization/BESNoDHW.mo
index be87c6ab..a892e5bf 100644
--- a/BESMod/Examples/DesignOptimization/BESNoDHW.mo
+++ b/BESMod/Examples/DesignOptimization/BESNoDHW.mo
@@ -7,7 +7,7 @@ model BESNoDHW "Example to demonstrate usage without DHW"
hBui=sum(building.zoneParam.VAir)^(1/3),
ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
+ oneZoneParam,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
diff --git a/BESMod/Examples/GasBoilerBuildingOnly.mo b/BESMod/Examples/GasBoilerBuildingOnly.mo
index 4a1f6187..f77cd61c 100644
--- a/BESMod/Examples/GasBoilerBuildingOnly.mo
+++ b/BESMod/Examples/GasBoilerBuildingOnly.mo
@@ -5,8 +5,9 @@ model GasBoilerBuildingOnly
redeclare BESMod.Systems.Demand.Building.TEASERThermalZone building(
hBui=sum(building.zoneParam.VAir)^(1/3),
ABui=sum(building.zoneParam.VAir)^(2/3),
+ ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0)),
+ oneZoneParam),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
@@ -48,7 +49,7 @@ model GasBoilerBuildingOnly
parameterStudy,
redeclare BESMod.Systems.RecordsCollection.ExampleSystemParameters
systemParameters(
- QBui_flow_nominal={12820},
+ QBui_flow_nominal=building.QRec_flow_nominal,
THydSup_nominal={338.15},
use_ventilation=false,
use_dhw=false,
diff --git a/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo b/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
index 82d36c57..8d05573e 100644
--- a/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
+++ b/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
@@ -7,8 +7,9 @@ package BaseClasses "Contains partial example case"
redeclare Systems.Demand.Building.TEASERThermalZone building(
ABui=sum(building.zoneParam.VAir)^(2/3),
hBui=sum(building.zoneParam.VAir)^(1/3),
+ ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
+ oneZoneParam,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
diff --git a/BESMod/Examples/ModelicaConferencePaper/TEASERBuilding.mo b/BESMod/Examples/ModelicaConferencePaper/TEASERBuilding.mo
index 0da3e488..702cdd4f 100644
--- a/BESMod/Examples/ModelicaConferencePaper/TEASERBuilding.mo
+++ b/BESMod/Examples/ModelicaConferencePaper/TEASERBuilding.mo
@@ -6,10 +6,9 @@ model TEASERBuilding
hZone={483.48248/185.9548},
ABui=sum(building.zoneParam.VAir)^(2/3),
hBui=sum(building.zoneParam.VAir)^(1/3),
- ARoo=building.oneZoneParam.ARoof, redeclare
+ ARoo=building.oneZoneParam.ARoof, redeclare
BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
- use_verboseEnergyBalance=false,
+ oneZoneParam, use_verboseEnergyBalance=false,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.UserProfiles.TEASERProfiles
userProfiles,
diff --git a/BESMod/Examples/Retrofit/BESParameters.mo b/BESMod/Examples/Retrofit/BESParameters.mo
new file mode 100644
index 00000000..ffb8ec3c
--- /dev/null
+++ b/BESMod/Examples/Retrofit/BESParameters.mo
@@ -0,0 +1,16 @@
+within BESMod.Examples.Retrofit;
+record BESParameters
+ extends Systems.RecordsCollection.SystemParametersBaseDataDefinition(
+ filNamWea=Modelica.Utilities.Files.loadResource(
+ "modelica://BESMod/Resources/WeatherData/TRY2015_522361130393_Jahr_City_Potsdam.mos"),
+ use_elecHeating=false,
+ final TAmbVen=min(TSetZone_nominal),
+ final TAmbHyd=min(TSetZone_nominal),
+ final TDHWWaterCold=283.15,
+ final TSetDHW=328.15,
+ final TVenSup_nominal=TSetZone_nominal,
+ final TSetZone_nominal=fill(293.15, nZones),
+ final nZones=1,
+ final use_ventilation=false);
+
+end BESParameters;
diff --git a/BESMod/Examples/Retrofit/Case1NoRetrofit.mo b/BESMod/Examples/Retrofit/Case1NoRetrofit.mo
new file mode 100644
index 00000000..c0a094bc
--- /dev/null
+++ b/BESMod/Examples/Retrofit/Case1NoRetrofit.mo
@@ -0,0 +1,19 @@
+within BESMod.Examples.Retrofit;
+model Case1NoRetrofit "Example with no retrofit at all"
+ extends PartialCase(building(redeclare
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.NoRetrofit1918_SingleDwelling
+ oneZoneParam), systemParameters(TOda_nominal=263.15, THydSup_nominal={338.15}));
+ extends Modelica.Icons.Example;
+
+ annotation (experiment(
+ StopTime=86400,
+ Interval=600,
+ Tolerance=1e-06),
+ __Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1NoRetrofit.mos"
+ "Simulate and plot"), Documentation(info="
+
+ This example demonstrates the usage of no retrofit,
+ where QOld_flow_design equals Q_flow_nominal.
+
+"));
+end Case1NoRetrofit;
diff --git a/BESMod/Examples/Retrofit/Case1PartialRetrofit.mo b/BESMod/Examples/Retrofit/Case1PartialRetrofit.mo
new file mode 100644
index 00000000..7a298134
--- /dev/null
+++ b/BESMod/Examples/Retrofit/Case1PartialRetrofit.mo
@@ -0,0 +1,38 @@
+within BESMod.Examples.Retrofit;
+model Case1PartialRetrofit
+ "Example with retrofit only of building envelope and single components"
+ extends PartialCase(
+ NoRetrofitHydGen=true,
+ NoRetrofitHydDis=false,
+ NoRetrofitHydTra=false,
+ building(redeclare
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.Retrofit1918_SingleDwelling
+ oneZoneParam),
+ systemParameters(
+ QBui_flow_nominal={5267.49},
+ TOda_nominal=263.15,
+ THydSup_nominal={318.15},
+ QBuiOld_flow_design={17442.7},
+ THydSupOld_design={338.15}));
+ extends Modelica.Icons.Example;
+
+ annotation (experiment(
+ StopTime=86400,
+ Interval=600,
+ Tolerance=1e-06),
+ __Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1PartialRetrofit.mos"
+ "Simulate and plot"), Documentation(info="
+
+ This example demonstrates the usage of partial retrofit,
+ where QOld_flow_design and Q_flow_nominal differ.
+ The values used in the systemParameters records are extracted
+ from the other examples
+ BESMod.Examples.Retrofit.Case1TotalRetrofit
+ and BESMod.Examples.Retrofit.Case1NoRetrofit.
+ Using TEASER and ebcpy, you can calculate these values in Python and
+ automate the setting if you do not have the old and new values at hand.
+ Alternativly, you can just simulate the other examples and extract the
+ values from the results.
+
+"));
+end Case1PartialRetrofit;
diff --git a/BESMod/Examples/Retrofit/Case1TotalRetrofit.mo b/BESMod/Examples/Retrofit/Case1TotalRetrofit.mo
new file mode 100644
index 00000000..2865c783
--- /dev/null
+++ b/BESMod/Examples/Retrofit/Case1TotalRetrofit.mo
@@ -0,0 +1,19 @@
+within BESMod.Examples.Retrofit;
+model Case1TotalRetrofit
+ extends PartialCase(building(redeclare
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.Retrofit1918_SingleDwelling
+ oneZoneParam), systemParameters(TOda_nominal=263.15, THydSup_nominal={318.15}));
+ extends Modelica.Icons.Example;
+
+ annotation (experiment(
+ StopTime=86400,
+ Interval=600,
+ Tolerance=1e-06),
+ __Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1TotalRetrofit.mos"
+ "Simulate and plot"), Documentation(info="
+
+ This example demonstrates the usage of a total retrofit,
+ where QOld_flow_design equals Q_flow_nominal.
+
+"));
+end Case1TotalRetrofit;
diff --git a/BESMod/Examples/Retrofit/PartialCase.mo b/BESMod/Examples/Retrofit/PartialCase.mo
new file mode 100644
index 00000000..cc6e5861
--- /dev/null
+++ b/BESMod/Examples/Retrofit/PartialCase.mo
@@ -0,0 +1,116 @@
+within BESMod.Examples.Retrofit;
+partial model PartialCase
+ extends Systems.BaseClasses.PartialBuildingEnergySystem(
+ redeclare BESMod.Systems.Electrical.DirectGridConnectionSystem electrical,
+ redeclare Systems.Demand.Building.TEASERThermalZone building(
+ hBui=sum(building.zoneParam.VAir)^(1/3),
+ ABui=sum(building.zoneParam.VAir)^(2/3),
+ ARoo=sum(building.zoneParam.ARoof),
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
+ redeclare BESMod.Systems.Control.NoControl control,
+ redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+ redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
+ generation(
+ use_old_design={NoRetrofitHydGen},
+ redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
+ redeclare package Medium_eva = AixLib.Media.Air,
+ redeclare
+ BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
+ parHeaPum(
+ genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
+ TBiv=TBiv,
+ scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/5000,
+ dpCon_nominal=0,
+ dpEva_nominal=0,
+ use_refIne=false,
+ refIneFre_constant=0),
+ redeclare
+ BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
+ parEleHea,
+ redeclare model PerDataMainHP =
+ AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
+ QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
+ refrigerant="Propane",
+ flowsheet="VIPhaseSeparatorFlowsheet"),
+ redeclare
+ BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
+ parTemSen),
+ redeclare Systems.Hydraulical.Control.MonoenergeticHeatPumpSystem
+ control(
+ redeclare
+ BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled
+ valCtrl,
+ dTHysBui=10,
+ dTHysDHW=10,
+ redeclare model DHWHysteresis =
+ BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,
+ redeclare model BuildingHysteresis =
+ BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,
+ redeclare
+ BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
+ parPIDHeaPum,
+ redeclare
+ BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl
+ safetyControl),
+ redeclare
+ BESMod.Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading
+ distribution(
+ use_old_design={NoRetrofitHydDis},
+ QHeaAftBuf_flow_nominal=0,
+ redeclare
+ BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
+ parTemSen,
+ redeclare
+ BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
+ parThrWayVal,
+ redeclare
+ BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage
+ parStoBuf(use_QLos=true, T_m=338.15),
+ redeclare
+ BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage
+ parStoDHW(
+ dTLoadingHC1=10,
+ use_QLos=true,
+ T_m=65 + 273.15),
+ redeclare
+ BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
+ parEleHeaAftBuf),
+ redeclare BESMod.Systems.Hydraulical.Transfer.RadiatorPressureBased
+ transfer(
+ use_oldRad_design={NoRetrofitHydTra},
+ redeclare
+ BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
+ parRad,
+ redeclare
+ BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
+ parTra,
+ redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum)),
+ redeclare Systems.Demand.DHW.StandardProfiles DHW(
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+ redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
+ redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
+ redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
+ calcmFlow),
+ redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
+ redeclare BESParameters systemParameters(QBui_flow_nominal=building.QRec_flow_nominal),
+ redeclare BESMod.Systems.RecordsCollection.ParameterStudy.NoStudy
+ parameterStudy,
+ redeclare final package MediumDHW = AixLib.Media.Water,
+ redeclare final package MediumZone = AixLib.Media.Air,
+ redeclare final package MediumHyd = AixLib.Media.Water,
+ redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);
+
+ parameter Modelica.Units.SI.Temperature TBiv=271.15
+ "Nominal bivalence temperature. = TOda_nominal for monovalent systems.";
+ parameter Boolean NoRetrofitHydTra = false
+ "If true, hydraulic transfersystem uses QBuiNoRetrofit.";
+ parameter Boolean NoRetrofitHydDis = false
+ "If true, hydraulic distribution system uses QBuiNoRetrofit.";
+ parameter Boolean NoRetrofitHydGen = false
+ "If true, hydraulic generation system uses QBuiNoRetrofit.";
+ annotation (experiment(
+ StopTime=31536000,
+ Interval=600,
+ __Dymola_Algorithm="Dassl"));
+end PartialCase;
diff --git a/BESMod/Examples/Retrofit/package.mo b/BESMod/Examples/Retrofit/package.mo
new file mode 100644
index 00000000..84f5a37a
--- /dev/null
+++ b/BESMod/Examples/Retrofit/package.mo
@@ -0,0 +1,5 @@
+within BESMod.Examples;
+package Retrofit "This package contains examples to show the effect of partial retrofit on the model"
+extends Modelica.Icons.ExamplesPackage;
+
+end Retrofit;
diff --git a/BESMod/Examples/Retrofit/package.order b/BESMod/Examples/Retrofit/package.order
new file mode 100644
index 00000000..1df0379b
--- /dev/null
+++ b/BESMod/Examples/Retrofit/package.order
@@ -0,0 +1,5 @@
+Case1NoRetrofit
+Case1TotalRetrofit
+Case1PartialRetrofit
+PartialCase
+BESParameters
diff --git a/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo b/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo
index 17a1b9de..f19ae621 100644
--- a/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo
+++ b/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo
@@ -6,8 +6,9 @@ partial model PartialSolarThermalHPS
redeclare Systems.Demand.Building.TEASERThermalZone building(
hBui=sum(building.zoneParam.VAir)^(1/3),
ABui=sum(building.zoneParam.VAir)^(2/3),
+ ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
- oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
+ oneZoneParam,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
diff --git a/BESMod/Examples/TEASERHeatLoadCalculation/Example.mo b/BESMod/Examples/TEASERHeatLoadCalculation/Example.mo
index 64374e70..758fb9d6 100644
--- a/BESMod/Examples/TEASERHeatLoadCalculation/Example.mo
+++ b/BESMod/Examples/TEASERHeatLoadCalculation/Example.mo
@@ -1,8 +1,8 @@
within BESMod.Examples.TEASERHeatLoadCalculation;
model Example "Simple example"
extends PartialCalculation(building(redeclare
- BESMod.Examples.BAUSimStudy.Buildings.Case_2_retrofit oneZoneParam(
- heaLoadFacOut=200, heaLoadFacGrd=100), energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.Retrofit1983_SingleDwelling
+ oneZoneParam, energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
userProfiles(dTSetBack=3));
extends Modelica.Icons.Example;
diff --git a/BESMod/Examples/package.order b/BESMod/Examples/package.order
index 3422d2af..16ea5d59 100644
--- a/BESMod/Examples/package.order
+++ b/BESMod/Examples/package.order
@@ -6,3 +6,4 @@ HighOrderModel
ModelicaConferencePaper
SolarThermalSystem
TEASERHeatLoadCalculation
+Retrofit
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt
index 8f64c127..caff91e5 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "5, 7, 1, 2, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714423522949219e+02, 2.713688049316406e+02, 2.711300048828125e+02, 2.708900146484375e+02, 2.706499938964844e+02, 2.704100036621094e+02, 2.701031188964844e+02, 2.696802062988281e+02, 2.693132629394531e+02, 2.689815979003906e+02, 2.687498474121094e+02, 2.687302856445312e+02, 2.684281311035156e+02, 2.677860412597656e+02, 2.674700012207031e+02, 2.672780151367188e+02, 2.670859985351562e+02, 2.668940124511719e+02, 2.667543640136719e+02, 2.674586791992188e+02, 2.682342834472656e+02, 2.686448669433594e+02, 2.692129211425781e+02, 2.700237121582031e+02, 2.708500061035156e+02, 2.716349792480469e+02, 2.723893127441406e+02, 2.729895324707031e+02, 2.733184814453125e+02, 2.734673461914062e+02, 2.735424194335938e+02, 2.735648498535156e+02, 2.73562255859375e+02, 2.734952392578125e+02, 2.733829650878906e+02, 2.733241271972656e+02, 2.733239440917969e+02, 2.734044799804688e+02, 2.735684204101562e+02, 2.736940002441406e+02, 2.737637023925781e+02, 2.737111511230469e+02, 2.734936828613281e+02, 2.733190002441406e+02, 2.73205322265625e+02, 2.731450805664062e+02, 2.731335754394531e+02, 2.7315283203125e+02, 2.732023315429688e+02, 2.7325e+02, 2.732466735839844e+02, 2.732464294433594e+02, 2.733169860839844e+02, 2.734288940429688e+02, 2.735700073242188e+02, 2.737182312011719e+02, 2.738376770019531e+02, 2.739303588867188e+02, 2.739819946289062e+02, 2.740299987792969e+02, 2.740780029296875e+02, 2.741260070800781e+02, 2.741852416992188e+02, 2.742919921875e+02, 2.743815307617188e+02, 2.744320983886719e+02, 2.744386291503906e+02, 2.742976684570312e+02, 2.742652587890625e+02, 2.743667907714844e+02, 2.744607849121094e+02, 2.74489013671875e+02, 2.745615539550781e+02, 2.748076477050781e+02, 2.751499938964844e+02, 2.755416259765625e+02, 2.759237670898438e+02, 2.761777038574219e+02, 2.763310241699219e+02, 2.764301147460938e+02, 2.764605407714844e+02, 2.7639404296875e+02, 2.762903747558594e+02, 2.7616455078125e+02, 2.760198059082031e+02, 2.758236999511719e+02, 2.755619812011719e+02, 2.753553771972656e+02, 2.751993103027344e+02, 2.751300048828125e+02, 2.750820007324219e+02, 2.750339965820312e+02, 2.749859924316406e+02, 2.749522399902344e+02, 2.751499938964844e+02, 2.753774108886719e+02, 2.755320129394531e+02, 2.756587219238281e+02, 2.756750183105469e+02, 2.755499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.3491748046875e+02, 3.117025146484375e+02, 3.2003955078125e+02, 3.160661926269531e+02, 3.157991333007812e+02, 3.217900390625e+02, 3.165887756347656e+02, 3.160388488769531e+02, 3.170673522949219e+02, 3.165102233886719e+02, 3.175675964355469e+02, 3.168063354492188e+02, 3.177531433105469e+02, 3.237828063964844e+02, 3.185469360351562e+02, 3.242951965332031e+02, 3.185414733886719e+02, 3.246577758789062e+02, 3.185420532226562e+02, 3.186630554199219e+02, 3.182372741699219e+02, 3.175739135742188e+02, 3.173452758789062e+02, 3.178413696289062e+02, 3.175972595214844e+02, 3.175349731445312e+02, 3.321705627441406e+02, 3.151083374023438e+02, 3.163138427734375e+02, 3.168260498046875e+02, 3.172643127441406e+02, 3.176151428222656e+02, 3.178878784179688e+02, 3.180792541503906e+02, 3.181939392089844e+02, 3.182578125e+02, 3.182676391601562e+02, 3.182093200683594e+02, 3.180656433105469e+02, 3.179201965332031e+02, 3.178294067382812e+02, 3.178373413085938e+02, 3.179975280761719e+02, 3.1812548828125e+02, 3.181871337890625e+02, 3.182210083007812e+02, 3.1825146484375e+02, 3.182840576171875e+02, 3.376649780273438e+02, 3.199752197265625e+02, 3.166868591308594e+02, 3.170969848632812e+02, 3.174357299804688e+02, 3.17718017578125e+02, 3.179611206054688e+02, 3.179478454589844e+02, 3.178291625976562e+02, 3.177041625976562e+02, 3.176226501464844e+02, 3.175683898925781e+02, 3.175231628417969e+02, 3.174789428710938e+02, 3.174295654296875e+02, 3.173485412597656e+02, 3.172584838867188e+02, 3.171904602050781e+02, 3.171649169921875e+02, 3.172599487304688e+02, 3.173358764648438e+02, 3.172858581542969e+02, 3.171900634765625e+02, 3.171340637207031e+02, 3.170663452148438e+02, 3.16865966796875e+02, 3.165504760742188e+02, 3.161707763671875e+02, 3.333964538574219e+02, 3.152683410644531e+02, 3.154954528808594e+02, 3.153814086914062e+02, 3.152578735351562e+02, 3.152570495605469e+02, 3.153377685546875e+02, 3.154583129882812e+02, 3.155991516113281e+02, 3.157791137695312e+02, 3.160216369628906e+02, 3.1623974609375e+02, 3.1640380859375e+02, 3.164905395507812e+02, 3.165419616699219e+02, 3.165845947265625e+02, 3.16626708984375e+02, 3.166628112792969e+02, 3.165299377441406e+02, 3.1630615234375e+02, 3.153948974609375e+02, 3.160557861328125e+02, 3.161543273925781e+02, 3.161622619628906e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.855846252441406e+02, 2.868638305664062e+02, 2.885064392089844e+02, 2.890126037597656e+02, 2.888433532714844e+02, 2.887399291992188e+02, 2.889256896972656e+02, 2.88768310546875e+02, 2.890914611816406e+02, 2.888852844238281e+02, 2.892231750488281e+02, 2.890071716308594e+02, 2.893941040039062e+02, 2.893530883789062e+02, 2.900553894042969e+02, 2.899274291992188e+02, 2.904108581542969e+02, 2.904541015625e+02, 2.907707824707031e+02, 2.910675964355469e+02, 2.910899047851562e+02, 2.911188659667969e+02, 2.911732788085938e+02, 2.911599426269531e+02, 2.911141052246094e+02, 2.910724792480469e+02, 2.910037231445312e+02, 2.906785888671875e+02, 2.909722290039062e+02, 2.911710510253906e+02, 2.913765258789062e+02, 2.915086364746094e+02, 2.915978698730469e+02, 2.916346435546875e+02, 2.916394653320312e+02, 2.916270141601562e+02, 2.91595947265625e+02, 2.915389709472656e+02, 2.914346923828125e+02, 2.913528747558594e+02, 2.913603515625e+02, 2.913662719726562e+02, 2.913625183105469e+02, 2.913729553222656e+02, 2.913475341796875e+02, 2.913220825195312e+02, 2.913506469726562e+02, 2.9138232421875e+02, 2.91242919921875e+02, 2.909131774902344e+02, 2.910637512207031e+02, 2.911532287597656e+02, 2.912467651367188e+02, 2.913337707519531e+02, 2.914149780273438e+02, 2.914812622070312e+02, 2.915093688964844e+02, 2.915206909179688e+02, 2.915293884277344e+02, 2.915433959960938e+02, 2.915610961914062e+02, 2.915799560546875e+02, 2.916724853515625e+02, 2.918880004882812e+02, 2.92064697265625e+02, 2.921498107910156e+02, 2.922250671386719e+02, 2.922747497558594e+02, 2.92404296875e+02, 2.92537841796875e+02, 2.926351013183594e+02, 2.927109680175781e+02, 2.927167053222656e+02, 2.926846618652344e+02, 2.926650085449219e+02, 2.926188049316406e+02, 2.925384826660156e+02, 2.923225708007812e+02, 2.924650573730469e+02, 2.92547607421875e+02, 2.925801086425781e+02, 2.925892028808594e+02, 2.926065368652344e+02, 2.926370849609375e+02, 2.926766662597656e+02, 2.927074279785156e+02, 2.927294006347656e+02, 2.927173767089844e+02, 2.926300659179688e+02, 2.92571533203125e+02, 2.925959167480469e+02, 2.926102294921875e+02, 2.926021728515625e+02, 2.92593994140625e+02, 2.925887756347656e+02, 2.925628051757812e+02, 2.922312622070312e+02, 2.924160766601562e+02, 2.925033874511719e+02, 2.925080871582031e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.368198547363281e+02, 3.120782165527344e+02, 3.2021337890625e+02, 3.160978393554688e+02, 3.158927307128906e+02, 3.157301635742188e+02, 3.168073120117188e+02, 3.162746276855469e+02, 3.164396362304688e+02, 3.168296508789062e+02, 3.167882995605469e+02, 3.171757507324219e+02, 3.166976318359375e+02, 3.174046020507812e+02, 3.18225830078125e+02, 3.178263244628906e+02, 3.189713439941406e+02, 3.247501525878906e+02, 3.191550903320312e+02, 3.244266052246094e+02, 3.185859985351562e+02, 3.179185791015625e+02, 3.175262451171875e+02, 3.173318481445312e+02, 3.173134460449219e+02, 3.174115905761719e+02, 3.33109130859375e+02, 3.153789978027344e+02, 3.165580749511719e+02, 3.171094665527344e+02, 3.175784301757812e+02, 3.179546508789062e+02, 3.180767517089844e+02, 3.181165771484375e+02, 3.181830749511719e+02, 3.182416381835938e+02, 3.182583618164062e+02, 3.182063598632812e+02, 3.180657043457031e+02, 3.179210510253906e+02, 3.178298950195312e+02, 3.178382568359375e+02, 3.179985046386719e+02, 3.181934204101562e+02, 3.183377075195312e+02, 3.184226379394531e+02, 3.184514465332031e+02, 3.217134094238281e+02, 3.159909973144531e+02, 3.168193054199219e+02, 3.173307189941406e+02, 3.177182312011719e+02, 3.180352478027344e+02, 3.181962585449219e+02, 3.181121215820312e+02, 3.17945556640625e+02, 3.177911071777344e+02, 3.176768188476562e+02, 3.176119384765625e+02, 3.175664367675781e+02, 3.175240478515625e+02, 3.174800720214844e+02, 3.174302062988281e+02, 3.173486022949219e+02, 3.172582092285156e+02, 3.171902160644531e+02, 3.171647644042969e+02, 3.172600708007812e+02, 3.173360900878906e+02, 3.172859497070312e+02, 3.171864929199219e+02, 3.171319274902344e+02, 3.170655822753906e+02, 3.168660583496094e+02, 3.165505981445312e+02, 3.161662292480469e+02, 3.346020202636719e+02, 3.153389892578125e+02, 3.154884643554688e+02, 3.153600158691406e+02, 3.152462768554688e+02, 3.152532653808594e+02, 3.15337646484375e+02, 3.15460205078125e+02, 3.156028747558594e+02, 3.15782958984375e+02, 3.160243225097656e+02, 3.1624169921875e+02, 3.164049377441406e+02, 3.164912414550781e+02, 3.165426940917969e+02, 3.165853576660156e+02, 3.166273498535156e+02, 3.166634521484375e+02, 3.16530517578125e+02, 3.156502075195312e+02, 3.162016296386719e+02, 3.161859130859375e+02, 3.160594177246094e+02, 3.160762939453125e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.85699951171875e+02, 2.871388549804688e+02, 2.888817443847656e+02, 2.8933935546875e+02, 2.891906127929688e+02, 2.891016845703125e+02, 2.893425598144531e+02, 2.891734924316406e+02, 2.893533935546875e+02, 2.893330383300781e+02, 2.894776000976562e+02, 2.894840087890625e+02, 2.8961669921875e+02, 2.899127197265625e+02, 2.9051904296875e+02, 2.904528198242188e+02, 2.91005126953125e+02, 2.908058471679688e+02, 2.9138134765625e+02, 2.912884216308594e+02, 2.916156616210938e+02, 2.916356201171875e+02, 2.915824279785156e+02, 2.914650268554688e+02, 2.914811401367188e+02, 2.914835205078125e+02, 2.914468078613281e+02, 2.911633605957031e+02, 2.914664916992188e+02, 2.916843872070312e+02, 2.919057922363281e+02, 2.920524597167969e+02, 2.921463928222656e+02, 2.92162109375e+02, 2.92151123046875e+02, 2.921365661621094e+02, 2.921099243164062e+02, 2.920588989257812e+02, 2.919600524902344e+02, 2.918822631835938e+02, 2.918922119140625e+02, 2.91901123046875e+02, 2.919019165039062e+02, 2.91920654296875e+02, 2.919149475097656e+02, 2.919095458984375e+02, 2.919501953125e+02, 2.919846801757812e+02, 2.915474853515625e+02, 2.916464538574219e+02, 2.917356567382812e+02, 2.918422546386719e+02, 2.91942138671875e+02, 2.920328063964844e+02, 2.920862426757812e+02, 2.921061706542969e+02, 2.921126708984375e+02, 2.921193237304688e+02, 2.921306457519531e+02, 2.921488037109375e+02, 2.921697998046875e+02, 2.921911010742188e+02, 2.922845458984375e+02, 2.924981384277344e+02, 2.926727294921875e+02, 2.927568359375e+02, 2.928313903808594e+02, 2.928813781738281e+02, 2.930115051269531e+02, 2.931454467773438e+02, 2.932413330078125e+02, 2.933151550292969e+02, 2.933202209472656e+02, 2.932891235351562e+02, 2.932689208984375e+02, 2.93221435546875e+02, 2.931389465332031e+02, 2.929524536132812e+02, 2.930748901367188e+02, 2.931455383300781e+02, 2.931735534667969e+02, 2.931827087402344e+02, 2.932016296386719e+02, 2.932341613769531e+02, 2.932760314941406e+02, 2.933088684082031e+02, 2.933328552246094e+02, 2.933223571777344e+02, 2.932382507324219e+02, 2.931833190917969e+02, 2.932084045410156e+02, 2.932227478027344e+02, 2.932151489257812e+02, 2.932077331542969e+02, 2.932041015625e+02, 2.928963928222656e+02, 2.930596618652344e+02, 2.931542663574219e+02, 2.931456604003906e+02, 2.93119140625e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[3.8241884765625e+03, 5.42628369140625e+03, 2.1143845703125e+04, 2.0953142578125e+04, 4.5540654296875e+03, 4.52993798828125e+03, 1.9449505859375e+04, 4.5468271484375e+03, 4.4995390625e+03, 4.53605029296875e+03, 4.4914326171875e+03, 4.5352373046875e+03, 4.49462841796875e+03, 4.52903125e+03, 2.0089693359375e+04, 4.52357958984375e+03, 2.0031419921875e+04, 4.50414794921875e+03, 1.9998697265625e+04, 4.48740869140625e+03, 4.52824169921875e+03, 4.5446025390625e+03, 4.5301396484375e+03, 4.5457890625e+03, 4.6099541015625e+03, 4.634318359375e+03, 4.6654404296875e+03, 5.390583984375e+03, 4.589375e+03, 4.6676513671875e+03, 4.7024775390625e+03, 4.73055517578125e+03, 4.751734375e+03, 4.76751806640625e+03, 4.7624970703125e+03, 4.74939990234375e+03, 4.72426123046875e+03, 4.669083984375e+03, 4.55525048828125e+03, 4.39196240234375e+03, 4.3148310546875e+03, 4.30247265625e+03, 4.40898388671875e+03, 4.68762109375e+03, 4.7708740234375e+03, 4.7694931640625e+03, 4.768830078125e+03, 4.7701396484375e+03, 4.77286572265625e+03, 5.6442890625e+03, 1.844215625e+04, 4.68537939453125e+03, 4.70843505859375e+03, 4.73075732421875e+03, 4.75186083984375e+03, 4.772138183593748e+03, 4.459993652343747e+03, 4.236755859375002e+03, 4.134638671875e+03, 4.1188310546875e+03, 4.109677734375e+03, 4.090229248046875e+03, 4.06312109375e+03, 4.0186474609375e+03, 3.9034912109375e+03, 3.806002197265625e+03, 3.76783935546875e+03, 3.770680419921875e+03, 3.898453369140626e+03, 3.894447265625001e+03, 3.740066406250001e+03, 3.62373779296875e+03, 3.59533740234375e+03, 3.552313232421875e+03, 3.3972373046875e+03, 3.205173583984375e+03, 3.028298583984375e+03, 5.67096826171875e+03, 4.028885009765625e+03, 3.339818359375e+03, 2.979287109375e+03, 2.886920166015625e+03, 2.931733154296875e+03, 2.999070068359375e+03, 3.060349365234375e+03, 3.1196142578125e+03, 3.2041982421875e+03, 3.328383056640625e+03, 3.40058544921875e+03, 3.446239501953125e+03, 3.443185546875e+03, 3.43184375e+03, 3.4357998046875e+03, 3.45126318359375e+03, 3.4611083984375e+03, 3.306343017578125e+03, 3.166990234375e+03, 4.70334716796875e+03, 4.019149658203125e+03, 3.427455322265625e+03, 3.289242919921875e+03]
+electricalGrid.PElecLoa=[4.087993408203125e+03, 5.86535595703125e+03, 2.2602833984375e+04, 2.213530078125e+04, 4.87001171875e+03, 4.8476083984375e+03, 4.82758447265625e+03, 4.8728173828125e+03, 4.82280615234375e+03, 4.81459521484375e+03, 4.81871240234375e+03, 4.8054248046875e+03, 4.82494482421875e+03, 4.788521484375e+03, 4.78948291015625e+03, 4.81958154296875e+03, 4.78698046875e+03, 4.8338720703125e+03, 2.134491015625e+04, 4.82354833984375e+03, 2.0830494140625e+04, 4.8776943359375e+03, 4.8619970703125e+03, 4.86920263671875e+03, 4.89865283203125e+03, 4.93746484375e+03, 4.97997705078125e+03, 5.8039951171875e+03, 4.92130810546875e+03, 5.0041474609375e+03, 5.04405322265625e+03, 5.07625244140625e+03, 5.1007294921875e+03, 4.84858349609375e+03, 4.744615234375e+03, 4.80238671875e+03, 4.832732421875e+03, 4.8006259765625e+03, 4.68852099609375e+03, 4.51861181640625e+03, 4.436388671875e+03, 4.42294970703125e+03, 4.52935986328125e+03, 4.81166455078125e+03, 5.002509765625e+03, 5.0646767578125e+03, 5.05453173828125e+03, 4.9906123046875e+03, 5.30027392578125e+03, 4.9655126953125e+03, 5.01678173828125e+03, 5.0474833984375e+03, 5.0712666015625e+03, 5.09426806640625e+03, 4.927146484375e+03, 4.578838378906247e+03, 4.359428222656249e+03, 4.268150878906251e+03, 4.2337587890625e+03, 4.2365107421875e+03, 4.2264267578125e+03, 4.20185205078125e+03, 4.17073876953125e+03, 4.12337158203125e+03, 4.00486083984375e+03, 3.90516015625e+03, 3.866417236328125e+03, 3.869660888671875e+03, 4.001114257812501e+03, 3.996393066406251e+03, 3.836985107421876e+03, 3.724373291015625e+03, 3.698987060546875e+03, 3.65507666015625e+03, 3.492743896484375e+03, 3.292119140625e+03, 3.1184296875e+03, 6.116083984375e+03, 4.00653271484375e+03, 3.367248046875e+03, 3.05224853515625e+03, 2.977468994140625e+03, 3.029114013671875e+03, 3.098284912109375e+03, 3.158406005859375e+03, 3.2122265625e+03, 3.29163720703125e+03, 3.41555078125e+03, 3.4863349609375e+03, 3.53159521484375e+03, 3.527385498046875e+03, 3.5138408203125e+03, 3.516185546875e+03, 3.530753662109375e+03, 3.539488525390625e+03, 3.37754833984375e+03, 4.810306640625e+03, 4.062450439453125e+03, 3.427209716796875e+03, 3.23474755859375e+03, 3.303385986328125e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt
index 4740fd26..fbde3eed 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "5, 7, 2, 0, 0, 1, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.089076232910156e+02, 3.169495239257812e+02, 3.219161376953125e+02, 3.249026489257812e+02, 3.266355590820312e+02, 3.27593505859375e+02, 3.278528137207031e+02, 3.278289489746094e+02, 3.278041381835938e+02, 3.277965087890625e+02, 3.277693481445312e+02, 3.276161193847656e+02, 3.274413757324219e+02, 3.272929382324219e+02, 3.271624755859375e+02, 3.271659851074219e+02, 3.271468200683594e+02, 3.268902587890625e+02, 3.266611938476562e+02, 3.267593688964844e+02, 3.268376159667969e+02, 3.266110229492188e+02, 3.226101684570312e+02, 3.001297912597656e+02, 2.948038330078125e+02, 2.935419006347656e+02, 2.932428588867188e+02, 3.135012207031251e+02, 3.206600646972656e+02, 3.24946044921875e+02, 3.218986511230469e+02, 3.247018127441406e+02, 3.246372985839844e+02, 3.245201416015625e+02, 3.24520751953125e+02, 3.066996765136719e+02, 2.963600463867188e+02, 2.939105834960938e+02, 2.933302307128906e+02, 3.08512451171875e+02, 3.175434265136719e+02, 3.231567993164062e+02, 3.257969970703125e+02, 3.258958435058594e+02, 3.258184509277344e+02, 3.258081359863281e+02, 3.258136901855469e+02, 3.258027038574219e+02, 3.257575988769531e+02, 3.257024536132812e+02, 3.256784362792969e+02, 3.256885986328125e+02, 3.217752685546875e+02, 3.255701599121094e+02, 3.262801818847656e+02, 3.26346435546875e+02, 3.264708557128906e+02, 3.266512145996094e+02, 3.268197021484375e+02, 3.268676452636719e+02, 3.268406677246094e+02, 3.267803649902344e+02, 3.267439270019531e+02, 3.267572937011719e+02, 3.267332153320312e+02, 3.265611267089844e+02, 3.264396057128906e+02, 3.265016784667969e+02, 3.265342407226562e+02, 3.264591369628906e+02, 3.263708801269531e+02, 3.208191223144531e+02, 2.997053833007812e+02, 2.947031555175781e+02, 2.935180053710938e+02, 2.932371826171875e+02, 3.304022827148438e+02, 3.180043640136719e+02, 3.239790344238281e+02, 3.263262939453125e+02, 3.261858215332031e+02, 3.259291381835938e+02, 3.257424011230469e+02, 3.259342346191406e+02, 3.065678100585938e+02, 2.963289184570312e+02, 2.939031372070312e+02, 2.933284301757812e+02, 3.097637023925781e+02, 3.176265258789062e+02, 3.225140686035156e+02, 3.254706420898438e+02, 3.271752319335938e+02, 3.283543090820312e+02, 3.292207336425781e+02, 3.299148864746094e+02, 3.307439270019531e+02, 3.260239562988281e+02, 3.28939697265625e+02, 3.311073913574219e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.88240966796875e+02, 2.888825378417969e+02, 2.893189392089844e+02, 2.895813903808594e+02, 2.897137756347656e+02, 2.897612915039062e+02, 2.897753295898438e+02, 2.897998657226562e+02, 2.898341064453125e+02, 2.898710632324219e+02, 2.899138488769531e+02, 2.899686889648438e+02, 2.901178283691406e+02, 2.90446044921875e+02, 2.907556457519531e+02, 2.909739074707031e+02, 2.911980895996094e+02, 2.913922729492188e+02, 2.915650024414062e+02, 2.916627807617188e+02, 2.917855834960938e+02, 2.91911376953125e+02, 2.920109558105469e+02, 2.910651245117188e+02, 2.902632141113281e+02, 2.896928100585938e+02, 2.892650451660156e+02, 2.901236877441406e+02, 2.9104150390625e+02, 2.917747497558594e+02, 2.917353210449219e+02, 2.921580200195312e+02, 2.922937927246094e+02, 2.922970886230469e+02, 2.92277099609375e+02, 2.918792114257812e+02, 2.908897705078125e+02, 2.901742553710938e+02, 2.895788269042969e+02, 2.895648498535156e+02, 2.904856567382812e+02, 2.911483764648438e+02, 2.91562744140625e+02, 2.916616821289062e+02, 2.916240234375e+02, 2.915882568359375e+02, 2.916249084472656e+02, 2.916652526855469e+02, 2.916847839355469e+02, 2.916996459960938e+02, 2.917323608398438e+02, 2.91769287109375e+02, 2.914434509277344e+02, 2.916419982910156e+02, 2.918683471679688e+02, 2.919217224121094e+02, 2.919584045410156e+02, 2.9200048828125e+02, 2.92046630859375e+02, 2.920934448242188e+02, 2.921352233886719e+02, 2.9217431640625e+02, 2.922938232421875e+02, 2.925662536621094e+02, 2.928145446777344e+02, 2.92960205078125e+02, 2.930818786621094e+02, 2.931609802246094e+02, 2.932504577636719e+02, 2.933277587890625e+02, 2.935517883300781e+02, 2.937270202636719e+02, 2.931527709960938e+02, 2.92513671875e+02, 2.920469055175781e+02, 2.916471862792969e+02, 2.921080932617188e+02, 2.926215515136719e+02, 2.933125610351562e+02, 2.937021179199219e+02, 2.937301635742188e+02, 2.936549377441406e+02, 2.935611267089844e+02, 2.934732971191406e+02, 2.933281860351562e+02, 2.926453247070312e+02, 2.919722290039062e+02, 2.914166259765625e+02, 2.913510131835938e+02, 2.920394592285156e+02, 2.925964050292969e+02, 2.929566650390625e+02, 2.931495666503906e+02, 2.932438659667969e+02, 2.933135375976562e+02, 2.933468627929688e+02, 2.933924255371094e+02, 2.928781433105469e+02, 2.931250915527344e+02, 2.93308349609375e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.089097900390625e+02, 3.169534301757812e+02, 3.219212951660156e+02, 3.249086608886719e+02, 3.266421508789062e+02, 3.276005859375e+02, 3.278534851074219e+02, 3.278287658691406e+02, 3.278040466308594e+02, 3.277965087890625e+02, 3.277693786621094e+02, 3.276161499023438e+02, 3.274412841796875e+02, 3.272928771972656e+02, 3.271624450683594e+02, 3.271659545898438e+02, 3.271467895507812e+02, 3.268902282714844e+02, 3.266611938476562e+02, 3.267593688964844e+02, 3.268376159667969e+02, 3.266109619140625e+02, 3.226101379394531e+02, 3.001298217773438e+02, 2.948038330078125e+02, 2.935419006347656e+02, 2.932428588867188e+02, 3.135110168457032e+02, 3.206701354980469e+02, 3.24949951171875e+02, 3.219051208496094e+02, 3.247024536132812e+02, 3.246370239257812e+02, 3.2452001953125e+02, 3.24520751953125e+02, 3.0669970703125e+02, 2.963600463867188e+02, 2.939105834960938e+02, 2.933302307128906e+02, 3.085238952636719e+02, 3.175549621582031e+02, 3.2316845703125e+02, 3.257992553710938e+02, 3.258955078125e+02, 3.258182373046875e+02, 3.2580810546875e+02, 3.25813720703125e+02, 3.25802734375e+02, 3.257575988769531e+02, 3.257024536132812e+02, 3.256784362792969e+02, 3.256885986328125e+02, 3.217817687988281e+02, 3.255741882324219e+02, 3.262804870605469e+02, 3.263461608886719e+02, 3.264707641601562e+02, 3.266513366699219e+02, 3.268197631835938e+02, 3.2686767578125e+02, 3.268406677246094e+02, 3.267802734375e+02, 3.267438659667969e+02, 3.267572631835938e+02, 3.267331848144531e+02, 3.265610961914062e+02, 3.264395751953125e+02, 3.265023193359375e+02, 3.265351867675781e+02, 3.264601135253906e+02, 3.263723754882812e+02, 3.208203430175781e+02, 2.997056884765625e+02, 2.947032165527344e+02, 2.935180053710938e+02, 2.932371826171875e+02, 3.30403076171875e+02, 3.180208129882812e+02, 3.239972839355469e+02, 3.263303833007812e+02, 3.261866149902344e+02, 3.2593017578125e+02, 3.25742919921875e+02, 3.259348449707031e+02, 3.065680847167969e+02, 2.963289794921875e+02, 2.939031372070312e+02, 2.933284301757812e+02, 3.097825317382812e+02, 3.1764306640625e+02, 3.225293273925781e+02, 3.254850769042969e+02, 3.27192138671875e+02, 3.283797607421875e+02, 3.292589721679688e+02, 3.29969482421875e+02, 3.307695922851562e+02, 3.260815734863281e+02, 3.290172729492188e+02, 3.312119750976562e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.882499389648438e+02, 2.888918762207031e+02, 2.893286437988281e+02, 2.895913696289062e+02, 2.897240905761719e+02, 2.897719116210938e+02, 2.897857666015625e+02, 2.898103332519531e+02, 2.898447875976562e+02, 2.898819885253906e+02, 2.89925048828125e+02, 2.899801330566406e+02, 2.901293029785156e+02, 2.904572143554688e+02, 2.907664794921875e+02, 2.90984375e+02, 2.912081909179688e+02, 2.914019165039062e+02, 2.915742797851562e+02, 2.916720886230469e+02, 2.91794921875e+02, 2.919207153320312e+02, 2.920203552246094e+02, 2.91075439453125e+02, 2.902745056152344e+02, 2.89705078125e+02, 2.892782592773438e+02, 2.901368103027344e+02, 2.9105419921875e+02, 2.917869262695312e+02, 2.917467041015625e+02, 2.921689758300781e+02, 2.923044128417969e+02, 2.923079528808594e+02, 2.922884826660156e+02, 2.918913269042969e+02, 2.909031066894531e+02, 2.901885070800781e+02, 2.895935974121094e+02, 2.895799560546875e+02, 2.905008544921875e+02, 2.911636352539062e+02, 2.915776672363281e+02, 2.916761169433594e+02, 2.916389770507812e+02, 2.916038513183594e+02, 2.916407470703125e+02, 2.916812744140625e+02, 2.917009582519531e+02, 2.917160339355469e+02, 2.917489318847656e+02, 2.917860107421875e+02, 2.914604797363281e+02, 2.916599426269531e+02, 2.918857727050781e+02, 2.919391174316406e+02, 2.919759826660156e+02, 2.920182189941406e+02, 2.920645141601562e+02, 2.921114501953125e+02, 2.921534118652344e+02, 2.921926574707031e+02, 2.923121032714844e+02, 2.925841064453125e+02, 2.928319702148438e+02, 2.929771423339844e+02, 2.930983276367188e+02, 2.931753845214844e+02, 2.932628784179688e+02, 2.933385009765625e+02, 2.93560302734375e+02, 2.937323303222656e+02, 2.931672973632812e+02, 2.925294189453125e+02, 2.920641784667969e+02, 2.916651916503906e+02, 2.921266479492188e+02, 2.926399230957031e+02, 2.933287353515625e+02, 2.937143859863281e+02, 2.937379760742188e+02, 2.936593322753906e+02, 2.935625610351562e+02, 2.934726257324219e+02, 2.933295593261719e+02, 2.926609191894531e+02, 2.91988037109375e+02, 2.914336547851562e+02, 2.913682861328125e+02, 2.920566711425781e+02, 2.926135559082031e+02, 2.92973876953125e+02, 2.931654357910156e+02, 2.932585144042969e+02, 2.933275756835938e+02, 2.933602294921875e+02, 2.934032287597656e+02, 2.928917846679688e+02, 2.931365661621094e+02, 2.933180541992188e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.1990263671875e+03, 4.4661513671875e+03, 4.8388720703125e+03, 5.11115185546875e+03, 5.26221728515625e+03, 5.33017919921875e+03, 5.36232177734375e+03, 5.0704208984375e+03, 4.96816943359375e+03, 4.95745068359375e+03, 4.95790771484375e+03, 4.9126767578125e+03, 4.75271240234375e+03, 4.649716796875e+03, 4.53889599609375e+03, 4.4406044921875e+03, 4.46455029296875e+03, 4.382242675781249e+03, 4.14623583984375e+03, 4.07030322265625e+03, 4.2204736328125e+03, 4.177609375e+03, 3.966850830078125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.677972656250003e+03, 5.1249443359375e+03, 4.90781689453125e+03, 5.23628759765625e+03, 3.952099365234375e+03, 3.341921630859375e+03, 3.31706689453125e+03, 3.345742431640625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.54120654296875e+03, 4.9401796875e+03, 5.255119140625e+03, 4.4823759765625e+03, 3.84277197265625e+03, 3.79643701171875e+03, 3.817864013671875e+03, 3.819183349609375e+03, 3.8028818359375e+03, 3.771660400390625e+03, 3.750482666015625e+03, 3.749578369140625e+03, 3.7586826171875e+03, 5.1717685546875e+03, 5.33237060546875e+03, 4.104666015624997e+03, 3.973572021484375e+03, 4.038336669921875e+03, 4.1191884765625e+03, 4.164865234375e+03, 4.12631689453125e+03, 4.082140869140625e+03, 4.04368505859375e+03, 4.033084716796875e+03, 4.015913330078125e+03, 3.946594970703125e+03, 3.818010498046875e+03, 3.793596435546875e+03, 3.853033203125e+03, 3.800436279296876e+03, 3.692036132812501e+03, 3.52383837890625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.65759765625e+03, 4.95947314453125e+03, 5.2790380859375e+03, 3.898479248046875e+03, 3.204798828125e+03, 2.98569970703125e+03, 2.86380224609375e+03, 2.9068466796875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.385943359375e+03, 4.78572119140625e+03, 5.0279716796875e+03, 5.15754150390625e+03, 5.206728515625e+03, 5.5066767578125e+03, 5.5530810546875e+03, 5.73770751953125e+03, 6.06149365234375e+03, 6.42652490234375e+03, 6.89448486328125e+03, 7.31361865234375e+03]
+electricalGrid.PElecLoa=[4.1990263671875e+03, 4.4661513671875e+03, 4.83908935546875e+03, 5.1114140625e+03, 5.26255419921875e+03, 5.33047998046875e+03, 5.3626513671875e+03, 5.0658623046875e+03, 4.96509375e+03, 4.95468603515625e+03, 4.95510498046875e+03, 4.90981396484375e+03, 4.74987548828125e+03, 4.647162109375e+03, 4.5365068359375e+03, 4.4383134765625e+03, 4.4623017578125e+03, 4.380088378906249e+03, 4.14424658203125e+03, 4.06846923828125e+03, 4.21857080078125e+03, 4.17570361328125e+03, 3.965174560546875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.678604003906253e+03, 5.1255849609375e+03, 4.9003828125e+03, 5.23663525390625e+03, 3.94870654296875e+03, 3.34027197265625e+03, 3.31564111328125e+03, 3.34426708984375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.54120654296875e+03, 4.94085400390625e+03, 5.25575830078125e+03, 4.47552392578125e+03, 3.83979248046875e+03, 3.79402001953125e+03, 3.815390380859375e+03, 3.8166298828125e+03, 3.8002919921875e+03, 3.7690517578125e+03, 3.74785400390625e+03, 3.74692138671875e+03, 3.75599267578125e+03, 5.17210693359375e+03, 5.32449609375e+03, 4.100172851562497e+03, 3.970489990234375e+03, 4.0353681640625e+03, 4.11577392578125e+03, 4.161306640625e+03, 4.12274658203125e+03, 4.078576904296875e+03, 4.0404072265625e+03, 4.029935791015625e+03, 4.012813720703125e+03, 3.9435810546875e+03, 3.815118408203125e+03, 3.7907861328125e+03, 3.84846533203125e+03, 3.793303222656251e+03, 3.682558105468751e+03, 3.51096630859375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.6576298828125e+03, 4.9604462890625e+03, 5.2800595703125e+03, 3.88319677734375e+03, 3.191609130859375e+03, 2.970382080078125e+03, 2.849037109375e+03, 2.89073974609375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.385943359375e+03, 4.78662158203125e+03, 5.0287275390625e+03, 5.15814453125e+03, 5.20746533203125e+03, 5.50781103515625e+03, 5.55483056640625e+03, 5.7396044921875e+03, 5.995466796875e+03, 6.4288076171875e+03, 6.8977978515625e+03, 7.317103515625e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt
index 8330a13c..6d100414 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt
@@ -1,4 +1,4 @@
-last-generated=2024-07-02
+last-generated=2024-07-16
statistics-initialization=
{
"linear": "0",
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.215202941894531e+02, 3.219565124511719e+02, 3.221394958496094e+02, 3.223133544921875e+02, 3.225346069335938e+02, 3.227500305175781e+02, 3.227832946777344e+02, 3.227899475097656e+02, 3.227926940917969e+02, 3.227936096191406e+02, 3.227616271972656e+02, 3.225937194824219e+02, 3.224303588867188e+02, 3.222870788574219e+02, 3.221586608886719e+02, 3.22175048828125e+02, 3.221385192871094e+02, 3.218602294921875e+02, 3.216575317382812e+02, 3.217870788574219e+02, 3.218324279785156e+02, 3.215806884765625e+02, 3.126929321289062e+02, 2.964081115722656e+02, 2.916763916015625e+02, 2.8993359375e+02, 2.891322937011719e+02, 3.201445922851562e+02, 3.204699401855469e+02, 3.201241760253906e+02, 3.195368041992188e+02, 3.194237060546875e+02, 3.19423095703125e+02, 3.194651489257812e+02, 3.195135803222656e+02, 3.01478515625e+02, 2.933348693847656e+02, 2.906322021484375e+02, 2.894480285644531e+02, 3.135838928222656e+02, 3.20224365234375e+02, 3.205013732910156e+02, 3.206305847167969e+02, 3.207018432617188e+02, 3.2076025390625e+02, 3.207975158691406e+02, 3.208114013671875e+02, 3.207996826171875e+02, 3.207524719238281e+02, 3.206996459960938e+02, 3.20679443359375e+02, 3.206910400390625e+02, 3.207395324707031e+02, 3.208587341308594e+02, 3.210523376464844e+02, 3.212527160644531e+02, 3.214534301757812e+02, 3.216529235839844e+02, 3.2181884765625e+02, 3.218563537597656e+02, 3.218304748535156e+02, 3.217745361328125e+02, 3.21745849609375e+02, 3.217613220214844e+02, 3.217269897460938e+02, 3.215445251464844e+02, 3.214408569335938e+02, 3.215133056640625e+02, 3.215235900878906e+02, 3.214359130859375e+02, 3.213305358886719e+02, 3.123632202148438e+02, 2.971321716308594e+02, 2.928616333007812e+02, 2.913024597167969e+02, 2.9059375e+02, 3.199228820800781e+02, 3.204760437011719e+02, 3.209529724121094e+02, 3.209825134277344e+02, 3.209297790527344e+02, 3.2081494140625e+02, 3.206853637695312e+02, 3.209090576171875e+02, 3.021502380371094e+02, 2.943196411132812e+02, 2.916966857910156e+02, 2.90571044921875e+02, 3.139537048339844e+02, 3.23824951171875e+02, 3.243091735839844e+02, 3.246210632324219e+02, 3.249992980957031e+02, 3.253718566894531e+02, 3.253740844726562e+02, 3.254739685058594e+02, 3.2577392578125e+02, 3.260267333984375e+02, 3.262257690429688e+02, 3.264139404296875e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.896968688964844e+02, 2.897545776367188e+02, 2.896888427734375e+02, 2.896223449707031e+02, 2.895513305664062e+02, 2.894822692871094e+02, 2.894268798828125e+02, 2.894242858886719e+02, 2.894393310546875e+02, 2.894568786621094e+02, 2.894791564941406e+02, 2.895105285644531e+02, 2.896391296386719e+02, 2.899462585449219e+02, 2.902334899902344e+02, 2.904323425292969e+02, 2.9063232421875e+02, 2.907960815429688e+02, 2.909470825195312e+02, 2.910342102050781e+02, 2.911355895996094e+02, 2.912329406738281e+02, 2.912338256835938e+02, 2.89213623046875e+02, 2.885853271484375e+02, 2.882908630371094e+02, 2.880851135253906e+02, 2.905428466796875e+02, 2.909561767578125e+02, 2.911372375488281e+02, 2.912803039550781e+02, 2.913558044433594e+02, 2.913960571289062e+02, 2.91397216796875e+02, 2.913740234375e+02, 2.900783996582031e+02, 2.889523620605469e+02, 2.884799499511719e+02, 2.881097106933594e+02, 2.889940185546875e+02, 2.905068664550781e+02, 2.905892028808594e+02, 2.906141052246094e+02, 2.906183166503906e+02, 2.905764770507812e+02, 2.905378112792969e+02, 2.905628662109375e+02, 2.9059033203125e+02, 2.905967102050781e+02, 2.905994262695312e+02, 2.906211853027344e+02, 2.906472473144531e+02, 2.906744079589844e+02, 2.907029724121094e+02, 2.907344970703125e+02, 2.90767578125e+02, 2.908012084960938e+02, 2.90835205078125e+02, 2.908702087402344e+02, 2.909026184082031e+02, 2.909317932128906e+02, 2.909595642089844e+02, 2.910679321289062e+02, 2.91327392578125e+02, 2.915599975585938e+02, 2.916867980957031e+02, 2.917959594726562e+02, 2.91866455078125e+02, 2.919538269042969e+02, 2.920411987304688e+02, 2.923094177246094e+02, 2.924203186035156e+02, 2.906716613769531e+02, 2.901900024414062e+02, 2.899935302734375e+02, 2.898120727539062e+02, 2.921451110839844e+02, 2.92321533203125e+02, 2.923946838378906e+02, 2.924658203125e+02, 2.925298156738281e+02, 2.925703125e+02, 2.925924987792969e+02, 2.926271057128906e+02, 2.912697143554688e+02, 2.901798095703125e+02, 2.89748291015625e+02, 2.89435791015625e+02, 2.903063049316406e+02, 2.919293212890625e+02, 2.920674133300781e+02, 2.921182250976562e+02, 2.921345825195312e+02, 2.921494445800781e+02, 2.92146728515625e+02, 2.921365661621094e+02, 2.9216455078125e+02, 2.921914978027344e+02, 2.921918029785156e+02, 2.921875610351562e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.215209350585938e+02, 3.219566650390625e+02, 3.221395263671875e+02, 3.223133850097656e+02, 3.225346374511719e+02, 3.227501525878906e+02, 3.227833251953125e+02, 3.227899780273438e+02, 3.22792724609375e+02, 3.227936401367188e+02, 3.227616577148438e+02, 3.225936584472656e+02, 3.224303588867188e+02, 3.222870788574219e+02, 3.221586303710938e+02, 3.221750183105469e+02, 3.221384887695312e+02, 3.218601989746094e+02, 3.216575012207031e+02, 3.217870788574219e+02, 3.218323974609375e+02, 3.215806274414062e+02, 3.126960144042969e+02, 2.964165954589844e+02, 2.916865844726562e+02, 2.899447326660156e+02, 2.891441955566406e+02, 3.2014599609375e+02, 3.204700317382812e+02, 3.201241760253906e+02, 3.195367126464844e+02, 3.194236755371094e+02, 3.19423095703125e+02, 3.194651794433594e+02, 3.195135803222656e+02, 3.014866638183594e+02, 2.933465270996094e+02, 2.90645263671875e+02, 2.894618225097656e+02, 3.135982360839844e+02, 3.202246704101562e+02, 3.2050146484375e+02, 3.20630615234375e+02, 3.207018432617188e+02, 3.207602844238281e+02, 3.207975463867188e+02, 3.208114318847656e+02, 3.207996826171875e+02, 3.207524719238281e+02, 3.206996459960938e+02, 3.206794738769531e+02, 3.206910400390625e+02, 3.207395629882812e+02, 3.208587341308594e+02, 3.210523681640625e+02, 3.212527160644531e+02, 3.214536437988281e+02, 3.216529846191406e+02, 3.218188781738281e+02, 3.218563842773438e+02, 3.218304748535156e+02, 3.217745666503906e+02, 3.21745849609375e+02, 3.217612915039062e+02, 3.217268371582031e+02, 3.215444641113281e+02, 3.214408264160156e+02, 3.215132751464844e+02, 3.215235595703125e+02, 3.214359130859375e+02, 3.213305053710938e+02, 3.123688049316406e+02, 2.97146240234375e+02, 2.928778686523438e+02, 2.913197021484375e+02, 2.906116943359375e+02, 3.199238891601562e+02, 3.204761962890625e+02, 3.209530029296875e+02, 3.209825134277344e+02, 3.209297485351562e+02, 3.208149108886719e+02, 3.206853637695312e+02, 3.209090576171875e+02, 3.021622619628906e+02, 2.94336181640625e+02, 2.9171484375e+02, 2.905901794433594e+02, 3.139735412597656e+02, 3.238264770507812e+02, 3.243094482421875e+02, 3.246211547851562e+02, 3.2499951171875e+02, 3.253717346191406e+02, 3.253740539550781e+02, 3.254739990234375e+02, 3.257739562988281e+02, 3.260267333984375e+02, 3.262257690429688e+02, 3.264138488769531e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.897055053710938e+02, 2.897633972167969e+02, 2.896979370117188e+02, 2.896317138671875e+02, 2.895609436035156e+02, 2.894921569824219e+02, 2.8943701171875e+02, 2.894346923828125e+02, 2.894500122070312e+02, 2.894677734375e+02, 2.894903259277344e+02, 2.895219421386719e+02, 2.896506042480469e+02, 2.899574279785156e+02, 2.902443237304688e+02, 2.904428100585938e+02, 2.906423950195312e+02, 2.908057250976562e+02, 2.909563293457031e+02, 2.910434875488281e+02, 2.911448974609375e+02, 2.912422790527344e+02, 2.912432556152344e+02, 2.892245788574219e+02, 2.885972900390625e+02, 2.883037414550781e+02, 2.88098876953125e+02, 2.905556335449219e+02, 2.909679260253906e+02, 2.911485290527344e+02, 2.912911071777344e+02, 2.913664245605469e+02, 2.914066772460938e+02, 2.914081115722656e+02, 2.913854370117188e+02, 2.900912170410156e+02, 2.889665832519531e+02, 2.884950256347656e+02, 2.881252136230469e+02, 2.890096740722656e+02, 2.905210876464844e+02, 2.906034545898438e+02, 2.906284484863281e+02, 2.906328430175781e+02, 2.905916748046875e+02, 2.905536499023438e+02, 2.905789489746094e+02, 2.906066284179688e+02, 2.906131896972656e+02, 2.906160888671875e+02, 2.906380615234375e+02, 2.90664306640625e+02, 2.906916198730469e+02, 2.907203674316406e+02, 2.907520446777344e+02, 2.907853088378906e+02, 2.908191223144531e+02, 2.90853271484375e+02, 2.908884582519531e+02, 2.909210205078125e+02, 2.909503784179688e+02, 2.909783020019531e+02, 2.910866088867188e+02, 2.913456726074219e+02, 2.915777893066406e+02, 2.917041320800781e+02, 2.918127746582031e+02, 2.918827514648438e+02, 2.919696044921875e+02, 2.92056884765625e+02, 2.923251342773438e+02, 2.924360656738281e+02, 2.906888427734375e+02, 2.902080688476562e+02, 2.900124206542969e+02, 2.898318176269531e+02, 2.92163818359375e+02, 2.923395080566406e+02, 2.92412109375e+02, 2.924827270507812e+02, 2.925461730957031e+02, 2.925863952636719e+02, 2.926084899902344e+02, 2.92643310546875e+02, 2.912875366210938e+02, 2.901991577148438e+02, 2.897686767578125e+02, 2.894569702148438e+02, 2.903276062011719e+02, 2.919489135742188e+02, 2.920865478515625e+02, 2.921373901367188e+02, 2.921537780761719e+02, 2.921687316894531e+02, 2.921665954589844e+02, 2.921570129394531e+02, 2.921851501464844e+02, 2.922122192382812e+02, 2.92212646484375e+02, 2.9220849609375e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[3.88858251953125e+03, 3.321498046875e+03, 3.200403564453125e+03, 3.259399658203125e+03, 3.32228857421875e+03, 3.408383544921875e+03, 3.4815146484375e+03, 3.491694580078125e+03, 3.498161376953125e+03, 3.500087646484375e+03, 3.501178466796875e+03, 3.4817919921875e+03, 3.41734765625e+03, 3.36034326171875e+03, 3.28178125e+03, 3.214536376953125e+03, 3.2073349609375e+03, 3.16120654296875e+03, 3.049912353515625e+03, 2.99240966796875e+03, 3.036968505859375e+03, 3.017434326171875e+03, 2.929090576171875e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.970831054687495e+03, 2.72154345703125e+03, 2.589751220703125e+03, 2.4594482421875e+03, 2.449735595703125e+03, 2.448956298828125e+03, 2.456535888671875e+03, 2.466309326171875e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.206453125e+03, 2.741622802734375e+03, 2.776778564453125e+03, 2.795714599609375e+03, 2.8094384765625e+03, 2.825131591796875e+03, 2.835739013671875e+03, 2.835485595703125e+03, 2.8283876953125e+03, 2.814026611328125e+03, 2.8018232421875e+03, 2.797045166015625e+03, 2.799046630859375e+03, 2.810447509765625e+03, 2.841068359375e+03, 2.88695361328125e+03, 2.932269775390625e+03, 2.9788291015625e+03, 3.031046142578125e+03, 3.06817236328125e+03, 3.06691015625e+03, 3.05261865234375e+03, 3.032236328125e+03, 3.018029296875e+03, 2.994607666015625e+03, 2.9533271484375e+03, 2.89047705078125e+03, 2.864356201171875e+03, 2.880515380859375e+03, 2.8645712890625e+03, 2.8301552734375e+03, 2.77352880859375e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.597523193359375e+03, 2.60923779296875e+03, 2.695148193359375e+03, 2.675523681640625e+03, 2.65410400390625e+03, 2.6171904296875e+03, 2.5904228515625e+03, 2.667017822265625e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.062532470703125e+03, 3.6893447265625e+03, 3.733939208984375e+03, 3.840103271484375e+03, 3.999489013671875e+03, 4.2173876953125e+03, 4.190279296875e+03, 4.3127646484375e+03, 4.58503759765625e+03, 4.82617236328125e+03, 5.03649755859375e+03, 5.2537021484375e+03]
+electricalGrid.PElecLoa=[3.88858251953125e+03, 3.32026708984375e+03, 3.19924951171875e+03, 3.258170654296875e+03, 3.320991943359375e+03, 3.406996826171875e+03, 3.479865234375e+03, 3.49e+03, 3.49641259765625e+03, 3.498287841796875e+03, 3.499328857421875e+03, 3.479903564453125e+03, 3.415646484375e+03, 3.35867236328125e+03, 3.28016455078125e+03, 3.212979248046875e+03, 3.205820556640625e+03, 3.159728515625e+03, 3.04853759765625e+03, 2.991105712890625e+03, 3.0356552734375e+03, 3.01614697265625e+03, 2.927962158203125e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.968524414062495e+03, 2.720214599609375e+03, 2.588484375e+03, 2.45844970703125e+03, 2.44877001953125e+03, 2.447992919921875e+03, 2.45555859375e+03, 2.465292724609375e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.206453125e+03, 2.74003076171875e+03, 2.77516943359375e+03, 2.794080078125e+03, 2.80778076171875e+03, 2.823409912109375e+03, 2.833945556640625e+03, 2.833657470703125e+03, 2.8265361328125e+03, 2.812155029296875e+03, 2.799932373046875e+03, 2.795133056640625e+03, 2.797111572265625e+03, 2.808486328125e+03, 2.83907470703125e+03, 2.884921875e+03, 2.93019970703125e+03, 2.976426025390625e+03, 3.028568115234375e+03, 3.065638671875e+03, 3.064348876953125e+03, 3.05004150390625e+03, 3.02964892578125e+03, 3.01544091796875e+03, 2.992069580078125e+03, 2.951171875e+03, 2.888396484375e+03, 2.862335693359375e+03, 2.878541748046875e+03, 2.86265478515625e+03, 2.828265869140625e+03, 2.771653564453125e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.595181396484375e+03, 2.607219482421875e+03, 2.693128173828125e+03, 2.673552734375e+03, 2.65219189453125e+03, 2.61532568359375e+03, 2.5885791015625e+03, 2.6651435546875e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.062532470703125e+03, 3.685321533203125e+03, 3.73023779296875e+03, 3.836264404296875e+03, 3.995215576171875e+03, 4.21324169921875e+03, 4.18617578125e+03, 4.30858349609375e+03, 4.5809375e+03, 4.822169921875e+03, 5.03256787109375e+03, 5.2502861328125e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt
index b6c70b44..0ed713cb 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt
@@ -1,4 +1,4 @@
-last-generated=2024-07-02
+last-generated=2024-07-16
statistics-initialization=
{
"nonlinear": "5, 7, 1, 1",
@@ -13,7 +13,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714423522949219e+02, 2.713688049316406e+02, 2.711300048828125e+02, 2.708900146484375e+02, 2.706499938964844e+02, 2.704100036621094e+02, 2.701031188964844e+02, 2.696802062988281e+02, 2.693132629394531e+02, 2.689815979003906e+02, 2.687498474121094e+02, 2.687302856445312e+02, 2.684281311035156e+02, 2.677860412597656e+02, 2.674700012207031e+02, 2.672780151367188e+02, 2.670859985351562e+02, 2.668940124511719e+02, 2.667543640136719e+02, 2.674586791992188e+02, 2.682342834472656e+02, 2.686448669433594e+02, 2.692129211425781e+02, 2.700237121582031e+02, 2.708500061035156e+02, 2.716349792480469e+02, 2.723893127441406e+02, 2.729895324707031e+02, 2.733184814453125e+02, 2.734673461914062e+02, 2.735424194335938e+02, 2.735648498535156e+02, 2.73562255859375e+02, 2.734952392578125e+02, 2.733829650878906e+02, 2.733241271972656e+02, 2.733239440917969e+02, 2.734044799804688e+02, 2.735684204101562e+02, 2.736940002441406e+02, 2.737637023925781e+02, 2.737111511230469e+02, 2.734936828613281e+02, 2.733190002441406e+02, 2.73205322265625e+02, 2.731450805664062e+02, 2.731335754394531e+02, 2.7315283203125e+02, 2.732023315429688e+02, 2.7325e+02, 2.732466735839844e+02, 2.732464294433594e+02, 2.733169860839844e+02, 2.734288940429688e+02, 2.735700073242188e+02, 2.737182312011719e+02, 2.738376770019531e+02, 2.739303588867188e+02, 2.739819946289062e+02, 2.740299987792969e+02, 2.740780029296875e+02, 2.741260070800781e+02, 2.741852416992188e+02, 2.742919921875e+02, 2.743815307617188e+02, 2.744320983886719e+02, 2.744386291503906e+02, 2.742976684570312e+02, 2.742652587890625e+02, 2.743667907714844e+02, 2.744607849121094e+02, 2.74489013671875e+02, 2.745615539550781e+02, 2.748076477050781e+02, 2.751499938964844e+02, 2.755416259765625e+02, 2.759237670898438e+02, 2.761777038574219e+02, 2.763310241699219e+02, 2.764301147460938e+02, 2.764605407714844e+02, 2.7639404296875e+02, 2.762903747558594e+02, 2.7616455078125e+02, 2.760198059082031e+02, 2.758236999511719e+02, 2.755619812011719e+02, 2.753553771972656e+02, 2.751993103027344e+02, 2.751300048828125e+02, 2.750820007324219e+02, 2.750339965820312e+02, 2.749859924316406e+02, 2.749522399902344e+02, 2.751499938964844e+02, 2.753774108886719e+02, 2.755320129394531e+02, 2.756587219238281e+02, 2.756750183105469e+02, 2.755499877929688e+02]
-hydraulic.generation.sigBusGen.TBoiOut=[2.931499938964844e+02, 3.135688171386719e+02, 3.202365112304688e+02, 3.246045532226562e+02, 3.265639953613281e+02, 3.269346313476562e+02, 3.272273559570312e+02, 3.275865783691406e+02, 3.280833129882812e+02, 3.285175476074219e+02, 3.289093627929688e+02, 3.29185546875e+02, 3.292109680175781e+02, 3.295597534179688e+02, 3.303141784667969e+02, 3.306959228515625e+02, 3.309231262207031e+02, 3.311487426757812e+02, 3.313746032714844e+02, 3.315420227050781e+02, 3.307281188964844e+02, 3.29808349609375e+02, 3.293170166015625e+02, 3.286499938964844e+02, 3.276954650878906e+02, 3.2672021484375e+02, 3.257929077148438e+02, 3.249019775390625e+02, 3.241908874511719e+02, 3.237990417480469e+02, 3.236222534179688e+02, 3.235337829589844e+02, 3.235072326660156e+02, 3.235101013183594e+02, 3.235878601074219e+02, 3.237200622558594e+02, 3.237909240722656e+02, 3.237921142578125e+02, 3.236983947753906e+02, 3.235054626464844e+02, 3.233558654785156e+02, 3.2327294921875e+02, 3.233326110839844e+02, 3.235870361328125e+02, 3.237953796386719e+02, 3.23930419921875e+02, 3.240023803710938e+02, 3.240166931152344e+02, 3.239943237304688e+02, 3.239360961914062e+02, 3.2387939453125e+02, 3.238822937011719e+02, 3.238832092285156e+02, 3.238013610839844e+02, 3.236698303222656e+02, 3.23503662109375e+02, 3.233285217285156e+02, 3.231869812011719e+02, 3.230770874023438e+02, 3.230156860351562e+02, 3.229592895507812e+02, 3.2290283203125e+02, 3.228462829589844e+02, 3.227771606445312e+02, 3.226528015136719e+02, 3.22546630859375e+02, 3.224857788085938e+02, 3.224768981933594e+02, 3.226408996582031e+02, 3.226833190917969e+02, 3.225658569335938e+02, 3.224540100097656e+02, 3.224194030761719e+02, 3.223346252441406e+02, 3.220469970703125e+02, 3.216441955566406e+02, 3.211830139160156e+02, 3.207315979003906e+02, 3.204310302734375e+02, 3.202507934570312e+02, 3.20136962890625e+02, 3.201005249023438e+02, 3.201744689941406e+02, 3.202945251464844e+02, 3.204415283203125e+02, 3.206117858886719e+02, 3.208399353027344e+02, 3.21147705078125e+02, 3.2138427734375e+02, 3.215681762695312e+02, 3.216567993164062e+02, 3.217160034179688e+02, 3.217725524902344e+02, 3.218287353515625e+02, 3.218690490722656e+02, 3.216398315429688e+02, 3.213709411621094e+02, 3.211878051757812e+02, 3.210378723144531e+02, 3.210162048339844e+02, 3.211617431640625e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.881192016601562e+02, 2.886946105957031e+02, 2.891133728027344e+02, 2.893863830566406e+02, 2.894655151367188e+02, 2.894427490234375e+02, 2.893832702636719e+02, 2.893573608398438e+02, 2.893623352050781e+02, 2.893749389648438e+02, 2.893992919921875e+02, 2.894461975097656e+02, 2.895641479492188e+02, 2.898534851074219e+02, 2.901842651367188e+02, 2.904429016113281e+02, 2.906950988769531e+02, 2.90918701171875e+02, 2.912264404296875e+02, 2.915252380371094e+02, 2.918908386230469e+02, 2.92201171875e+02, 2.922818298339844e+02, 2.921546325683594e+02, 2.921454162597656e+02, 2.920830993652344e+02, 2.91984130859375e+02, 2.920330505371094e+02, 2.921226196289062e+02, 2.922380676269531e+02, 2.923634338378906e+02, 2.924208068847656e+02, 2.924467163085938e+02, 2.924248352050781e+02, 2.923888549804688e+02, 2.923519592285156e+02, 2.923016052246094e+02, 2.922302551269531e+02, 2.921112060546875e+02, 2.920165710449219e+02, 2.920230407714844e+02, 2.920254211425781e+02, 2.920062561035156e+02, 2.919914245605469e+02, 2.919405517578125e+02, 2.918939819335938e+02, 2.919104919433594e+02, 2.919287109375e+02, 2.919258422851562e+02, 2.919183349609375e+02, 2.919274597167969e+02, 2.919427185058594e+02, 2.91961669921875e+02, 2.919792175292969e+02, 2.919950561523438e+02, 2.920090637207031e+02, 2.920211486816406e+02, 2.920333862304688e+02, 2.920458374023438e+02, 2.920605773925781e+02, 2.920761108398438e+02, 2.920918884277344e+02, 2.921880187988281e+02, 2.924333190917969e+02, 2.926493530273438e+02, 2.927654418945312e+02, 2.928688354492188e+02, 2.929411315917969e+02, 2.931249694824219e+02, 2.933370056152344e+02, 2.935135803222656e+02, 2.936620483398438e+02, 2.936881713867188e+02, 2.936364135742188e+02, 2.93610107421875e+02, 2.935646667480469e+02, 2.935097045898438e+02, 2.934701843261719e+02, 2.934329528808594e+02, 2.934086303710938e+02, 2.933533935546875e+02, 2.932774047851562e+02, 2.9322314453125e+02, 2.931900939941406e+02, 2.931734008789062e+02, 2.931552124023438e+02, 2.931420593261719e+02, 2.931044311523438e+02, 2.930535583496094e+02, 2.930401611328125e+02, 2.930755920410156e+02, 2.930923461914062e+02, 2.930883483886719e+02, 2.9308349609375e+02, 2.930841979980469e+02, 2.930783386230469e+02, 2.930850524902344e+02, 2.930903015136719e+02, 2.930743713378906e+02, 2.930587158203125e+02]
+hydraulic.generation.sigBusGen.TBoiOut=[2.931499938964844e+02, 3.135543823242188e+02, 3.202092895507812e+02, 3.24570068359375e+02, 3.265616760253906e+02, 3.269342651367188e+02, 3.272273254394531e+02, 3.275865783691406e+02, 3.280832824707031e+02, 3.285175170898438e+02, 3.289093322753906e+02, 3.291855163574219e+02, 3.292109375e+02, 3.295597229003906e+02, 3.303141479492188e+02, 3.306958618164062e+02, 3.30923095703125e+02, 3.311487121582031e+02, 3.313745727539062e+02, 3.315419921875e+02, 3.307281188964844e+02, 3.29808349609375e+02, 3.293170166015625e+02, 3.286499938964844e+02, 3.276954650878906e+02, 3.2672021484375e+02, 3.257929077148438e+02, 3.249019775390625e+02, 3.241908874511719e+02, 3.237990417480469e+02, 3.236222229003906e+02, 3.235337524414062e+02, 3.235072021484375e+02, 3.235101013183594e+02, 3.235878601074219e+02, 3.237200622558594e+02, 3.237909240722656e+02, 3.237921142578125e+02, 3.236983947753906e+02, 3.235054626464844e+02, 3.233558349609375e+02, 3.232729187011719e+02, 3.233326110839844e+02, 3.235870361328125e+02, 3.237953796386719e+02, 3.23930419921875e+02, 3.240023803710938e+02, 3.240166931152344e+02, 3.239943237304688e+02, 3.239360961914062e+02, 3.2387939453125e+02, 3.238822937011719e+02, 3.238832092285156e+02, 3.238013610839844e+02, 3.236698303222656e+02, 3.23503662109375e+02, 3.233285217285156e+02, 3.231869812011719e+02, 3.230770874023438e+02, 3.230156860351562e+02, 3.229592895507812e+02, 3.2290283203125e+02, 3.228462524414062e+02, 3.227771606445312e+02, 3.226528015136719e+02, 3.22546630859375e+02, 3.224857788085938e+02, 3.224768981933594e+02, 3.22640869140625e+02, 3.226833190917969e+02, 3.225657653808594e+02, 3.224538879394531e+02, 3.224191589355469e+02, 3.22334228515625e+02, 3.220464477539062e+02, 3.21643310546875e+02, 3.211817321777344e+02, 3.20729736328125e+02, 3.204279479980469e+02, 3.202462463378906e+02, 3.20130126953125e+02, 3.200945129394531e+02, 3.201731262207031e+02, 3.202968444824219e+02, 3.204463500976562e+02, 3.206170043945312e+02, 3.208446655273438e+02, 3.211507568359375e+02, 3.213871154785156e+02, 3.215696716308594e+02, 3.216570739746094e+02, 3.217160339355469e+02, 3.217726135253906e+02, 3.21828857421875e+02, 3.218692016601562e+02, 3.216401062011719e+02, 3.213711242675781e+02, 3.211878356933594e+02, 3.210379333496094e+02, 3.21016357421875e+02, 3.21161865234375e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.881063842773438e+02, 2.886645812988281e+02, 2.890700988769531e+02, 2.89333984375e+02, 2.894095153808594e+02, 2.893839416503906e+02, 2.893217163085938e+02, 2.892928161621094e+02, 2.892946166992188e+02, 2.893041076660156e+02, 2.893254089355469e+02, 2.8936962890625e+02, 2.894847106933594e+02, 2.897701721191406e+02, 2.900966796875e+02, 2.903512878417969e+02, 2.905995178222656e+02, 2.908190612792969e+02, 2.911229248046875e+02, 2.914195251464844e+02, 2.917843017578125e+02, 2.920940856933594e+02, 2.921735534667969e+02, 2.920463256835938e+02, 2.920379333496094e+02, 2.919767456054688e+02, 2.918789367675781e+02, 2.919273071289062e+02, 2.920155334472656e+02, 2.921291809082031e+02, 2.922524108886719e+02, 2.923080444335938e+02, 2.923325500488281e+02, 2.923097839355469e+02, 2.922733764648438e+02, 2.922360534667969e+02, 2.921854248046875e+02, 2.921134948730469e+02, 2.919932556152344e+02, 2.918975830078125e+02, 2.919031677246094e+02, 2.919045104980469e+02, 2.918840026855469e+02, 2.918677368164062e+02, 2.9181640625e+02, 2.917694702148438e+02, 2.917848510742188e+02, 2.918020629882812e+02, 2.917981872558594e+02, 2.917897338867188e+02, 2.917979125976562e+02, 2.918121948242188e+02, 2.918302307128906e+02, 2.918469848632812e+02, 2.918621215820312e+02, 2.918755493164062e+02, 2.918870544433594e+02, 2.918987121582031e+02, 2.919104919433594e+02, 2.919245300292969e+02, 2.919393920898438e+02, 2.919544982910156e+02, 2.920496826171875e+02, 2.922937316894531e+02, 2.92508544921875e+02, 2.926231384277344e+02, 2.927249755859375e+02, 2.927954406738281e+02, 2.929775695800781e+02, 2.931898803710938e+02, 2.933671264648438e+02, 2.935170593261719e+02, 2.935459899902344e+02, 2.934995727539062e+02, 2.934819946289062e+02, 2.934499816894531e+02, 2.934142761230469e+02, 2.934017028808594e+02, 2.934053039550781e+02, 2.934438781738281e+02, 2.934700317382812e+02, 2.934562072753906e+02, 2.934209899902344e+02, 2.933716125488281e+02, 2.933177185058594e+02, 2.932568054199219e+02, 2.932060546875e+02, 2.931412353515625e+02, 2.930659790039062e+02, 2.930367431640625e+02, 2.930679016113281e+02, 2.930828857421875e+02, 2.930766296386719e+02, 2.930695190429688e+02, 2.930685119628906e+02, 2.930606079101562e+02, 2.93065673828125e+02, 2.930699462890625e+02, 2.930524291992188e+02, 2.930344848632812e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.432639479637146e-02, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.221918106079102e+00, 6.217138290405273e+00, 6.207793235778809e+00, 6.190108299255371e+00, 6.163281440734863e+00, 6.127903461456299e+00, 6.069961547851562e+00, 5.98074197769165e+00, 5.846057415008545e+00, 5.626513004302979e+00, 5.258453369140625e+00, 4.775506019592285e+00, 4.315811157226562e+00, 4.024718284606934e+00, 3.868175745010376e+00, 3.787058353424072e+00, 3.73271918296814e+00, 3.745315790176392e+00, 3.809149742126465e+00, 4.02750301361084e+00, 4.434386730194092e+00, 4.756626605987549e+00, 4.866801261901855e+00, 4.957830429077148e+00, 5.082311153411865e+00, 5.216246604919434e+00, 5.337132930755615e+00, 5.454156398773193e+00, 5.535310745239258e+00, 5.599663734436035e+00, 5.680179119110107e+00, 5.759285449981689e+00]
+electricalGrid.PElecLoa=[4.334544017910957e-02, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.089551448822021e+00, 6.088527202606201e+00, 6.083003997802734e+00, 6.07279109954834e+00, 6.059781074523926e+00, 6.04649543762207e+00, 6.028879165649414e+00, 6.00827693939209e+00, 5.98477840423584e+00, 5.954125881195068e+00, 5.909988880157471e+00, 5.829349040985107e+00, 5.682295322418213e+00, 5.44248104095459e+00, 5.070602416992188e+00, 4.70603084564209e+00, 4.389813899993896e+00, 4.165919780731201e+00, 4.081663608551025e+00, 4.193879127502441e+00, 4.540350914001465e+00, 4.826388835906982e+00, 4.944345951080322e+00, 5.047245979309082e+00, 5.184341907501221e+00, 5.31446647644043e+00, 5.41754674911499e+00, 5.512200832366943e+00, 5.581063270568848e+00, 5.636735916137695e+00, 5.70089864730835e+00, 5.762171268463135e+00]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt
index b6dc61a2..add7bbbf 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "0, 0, 5, 7, 2, 2, 1, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.245394897460938e+02, 3.350957946777344e+02, 3.118304443359375e+02, 3.169837951660156e+02, 3.199172668457031e+02, 3.220625915527344e+02, 3.229765625e+02, 3.229881896972656e+02, 3.228804626464844e+02, 3.228187866210938e+02, 3.227675170898438e+02, 3.22606201171875e+02, 3.224334411621094e+02, 3.222836303710938e+02, 3.221546325683594e+02, 3.221596984863281e+02, 3.221351928710938e+02, 3.218752746582031e+02, 3.320315246582031e+02, 3.218241882324219e+02, 3.220244750976562e+02, 3.216925354003906e+02, 3.213760375976562e+02, 3.212333374023438e+02, 3.211253662109375e+02, 3.209453125e+02, 3.20735107421875e+02, 3.206016235351562e+02, 3.205196533203125e+02, 3.201492004394531e+02, 3.195509338378906e+02, 3.193973999023438e+02, 3.194029235839844e+02, 3.194559631347656e+02, 3.195106811523438e+02, 3.195487365722656e+02, 3.195699462890625e+02, 3.19716796875e+02, 3.199164428710938e+02, 3.201213684082031e+02, 3.203252258300781e+02, 3.207994079589844e+02, 3.208019104003906e+02, 3.208400573730469e+02, 3.208157043457031e+02, 3.208130187988281e+02, 3.208144226074219e+02, 3.2080126953125e+02, 3.207558898925781e+02, 3.20701416015625e+02, 3.206767883300781e+02, 3.20686279296875e+02, 3.20202392578125e+02, 3.210560607910156e+02, 3.211631469726562e+02, 3.2128857421875e+02, 3.214601745605469e+02, 3.216543579101562e+02, 3.218229064941406e+02, 3.218688659667969e+02, 3.218415832519531e+02, 3.217808837890625e+02, 3.217432250976562e+02, 3.217525329589844e+02, 3.217260131835938e+02, 3.215579223632812e+02, 3.2144091796875e+02, 3.214977111816406e+02, 3.209167175292969e+02, 3.216477966308594e+02, 3.21459716796875e+02, 3.21238037109375e+02, 3.210333862304688e+02, 3.206873474121094e+02, 3.202982788085938e+02, 3.201165161132812e+02, 3.201397705078125e+02, 3.20487548828125e+02, 3.209494323730469e+02, 3.210118103027344e+02, 3.209517822265625e+02, 3.208345031738281e+02, 3.207016296386719e+02, 3.208998413085938e+02, 3.215475463867188e+02, 3.222877807617188e+02, 3.230612487792969e+02, 3.2359619140625e+02, 3.238978576660156e+02, 3.2413134765625e+02, 3.24002685546875e+02, 3.247429504394531e+02, 3.251238098144531e+02, 3.253805236816406e+02, 3.254094543457031e+02, 3.248877868652344e+02, 3.257372436523438e+02, 3.260375061035156e+02, 3.261962280273438e+02, 3.263520202636719e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.873793640136719e+02, 2.870571899414062e+02, 2.885594177246094e+02, 2.886374206542969e+02, 2.888567199707031e+02, 2.890020446777344e+02, 2.891070861816406e+02, 2.891455993652344e+02, 2.891625671386719e+02, 2.891782836914062e+02, 2.892027587890625e+02, 2.892420654296875e+02, 2.893742980957031e+02, 2.896822204589844e+02, 2.899709777832031e+02, 2.901666259765625e+02, 2.903695983886719e+02, 2.905442504882812e+02, 2.905624084472656e+02, 2.906877746582031e+02, 2.908802185058594e+02, 2.909920654296875e+02, 2.910723876953125e+02, 2.910701599121094e+02, 2.910740661621094e+02, 2.910573120117188e+02, 2.910229187011719e+02, 2.911257629394531e+02, 2.912570495605469e+02, 2.914147644042969e+02, 2.915523376464844e+02, 2.9160009765625e+02, 2.916271667480469e+02, 2.916216735839844e+02, 2.915932006835938e+02, 2.915564270019531e+02, 2.915037536621094e+02, 2.914254150390625e+02, 2.913086547851562e+02, 2.912252197265625e+02, 2.912439575195312e+02, 2.907655029296875e+02, 2.912171630859375e+02, 2.912450866699219e+02, 2.9118212890625e+02, 2.91124755859375e+02, 2.911383666992188e+02, 2.9115673828125e+02, 2.911553955078125e+02, 2.911497497558594e+02, 2.911619567871094e+02, 2.911785278320312e+02, 2.909054260253906e+02, 2.911973266601562e+02, 2.912345275878906e+02, 2.912527770996094e+02, 2.912744445800781e+02, 2.912996826171875e+02, 2.913282775878906e+02, 2.913581848144531e+02, 2.913828125e+02, 2.914046630859375e+02, 2.915056762695312e+02, 2.917579040527344e+02, 2.919869079589844e+02, 2.921149597167969e+02, 2.922173461914062e+02, 2.922757873535156e+02, 2.920428466796875e+02, 2.924262390136719e+02, 2.927106628417969e+02, 2.929747619628906e+02, 2.931434631347656e+02, 2.932249145507812e+02, 2.932479553222656e+02, 2.932057495117188e+02, 2.931593322753906e+02, 2.931388549804688e+02, 2.931669616699219e+02, 2.932199096679688e+02, 2.932557373046875e+02, 2.93266357421875e+02, 2.93260009765625e+02, 2.932528381347656e+02, 2.932706909179688e+02, 2.932928161621094e+02, 2.933026123046875e+02, 2.932620849609375e+02, 2.931403198242188e+02, 2.9305859375e+02, 2.930208740234375e+02, 2.930758361816406e+02, 2.930816345214844e+02, 2.930736999511719e+02, 2.930650329589844e+02, 2.929660339355469e+02, 2.930476989746094e+02, 2.930875854492188e+02, 2.930807495117188e+02, 2.930681762695312e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.245396423339844e+02, 3.350958251953125e+02, 3.118341369628906e+02, 3.169881591796875e+02, 3.199224853515625e+02, 3.220684814453125e+02, 3.229777221679688e+02, 3.229879760742188e+02, 3.228802490234375e+02, 3.228186950683594e+02, 3.227675170898438e+02, 3.226062316894531e+02, 3.224334716796875e+02, 3.222836303710938e+02, 3.221546325683594e+02, 3.2215966796875e+02, 3.221351623535156e+02, 3.218751831054688e+02, 3.320304260253906e+02, 3.218243408203125e+02, 3.220244140625e+02, 3.216924438476562e+02, 3.213760375976562e+02, 3.212333679199219e+02, 3.211253967285156e+02, 3.209453430175781e+02, 3.207351684570312e+02, 3.206016540527344e+02, 3.205195617675781e+02, 3.201491394042969e+02, 3.195509033203125e+02, 3.193973693847656e+02, 3.194029235839844e+02, 3.194559631347656e+02, 3.195106811523438e+02, 3.195487670898438e+02, 3.195699768066406e+02, 3.197168273925781e+02, 3.199164733886719e+02, 3.201213989257812e+02, 3.203252868652344e+02, 3.207997131347656e+02, 3.208019409179688e+02, 3.208400268554688e+02, 3.208157043457031e+02, 3.208130493164062e+02, 3.20814453125e+02, 3.2080126953125e+02, 3.207559204101562e+02, 3.207014465332031e+02, 3.206768188476562e+02, 3.20686279296875e+02, 3.202043762207031e+02, 3.210559997558594e+02, 3.211629943847656e+02, 3.212885131835938e+02, 3.214601440429688e+02, 3.216543579101562e+02, 3.218229370117188e+02, 3.218688659667969e+02, 3.218415832519531e+02, 3.217809143066406e+02, 3.217432250976562e+02, 3.217525024414062e+02, 3.217260131835938e+02, 3.215578918457031e+02, 3.214408874511719e+02, 3.214976806640625e+02, 3.209177856445312e+02, 3.216476745605469e+02, 3.214596252441406e+02, 3.212379150390625e+02, 3.210330505371094e+02, 3.206847839355469e+02, 3.202970886230469e+02, 3.201175842285156e+02, 3.20141845703125e+02, 3.204891967773438e+02, 3.209512634277344e+02, 3.210143737792969e+02, 3.209552917480469e+02, 3.20836669921875e+02, 3.207014465332031e+02, 3.208981323242188e+02, 3.215462646484375e+02, 3.22287109375e+02, 3.230628662109375e+02, 3.235974426269531e+02, 3.238978881835938e+02, 3.241305541992188e+02, 3.240023803710938e+02, 3.24747802734375e+02, 3.251264038085938e+02, 3.253804321289062e+02, 3.254085388183594e+02, 3.248779907226562e+02, 3.257368774414062e+02, 3.260408630371094e+02, 3.261988830566406e+02, 3.263524780273438e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.873885803222656e+02, 2.870670166015625e+02, 2.88569091796875e+02, 2.886474914550781e+02, 2.888670959472656e+02, 2.890127258300781e+02, 2.891177673339844e+02, 2.891562805175781e+02, 2.891734619140625e+02, 2.891894226074219e+02, 2.892141723632812e+02, 2.892537231445312e+02, 2.893860168457031e+02, 2.896936340332031e+02, 2.899820251464844e+02, 2.901773071289062e+02, 2.903799133300781e+02, 2.905541076660156e+02, 2.905719604492188e+02, 2.906973266601562e+02, 2.908897399902344e+02, 2.910016174316406e+02, 2.910820007324219e+02, 2.910802917480469e+02, 2.910847778320312e+02, 2.910686340332031e+02, 2.910349426269531e+02, 2.911376953125e+02, 2.912685852050781e+02, 2.914258728027344e+02, 2.9156298828125e+02, 2.91610595703125e+02, 2.916376342773438e+02, 2.916324462890625e+02, 2.916044921875e+02, 2.915682983398438e+02, 2.915162353515625e+02, 2.914383850097656e+02, 2.913218078613281e+02, 2.91238525390625e+02, 2.912574157714844e+02, 2.907794799804688e+02, 2.912309875488281e+02, 2.912590637207031e+02, 2.911967468261719e+02, 2.911400146484375e+02, 2.911538696289062e+02, 2.911724243164062e+02, 2.911712951660156e+02, 2.911658630371094e+02, 2.9117822265625e+02, 2.911950073242188e+02, 2.909229431152344e+02, 2.912142639160156e+02, 2.912515563964844e+02, 2.912699584960938e+02, 2.912918090820312e+02, 2.913172302246094e+02, 2.913460083007812e+02, 2.913760375976562e+02, 2.9140087890625e+02, 2.914228515625e+02, 2.915238037109375e+02, 2.917756652832031e+02, 2.920042419433594e+02, 2.921318359375e+02, 2.922337036132812e+02, 2.922916259765625e+02, 2.920584716796875e+02, 2.924414978027344e+02, 2.92725830078125e+02, 2.929898071289062e+02, 2.931579284667969e+02, 2.932375793457031e+02, 2.932597045898438e+02, 2.93216796875e+02, 2.931697692871094e+02, 2.931478576660156e+02, 2.931741333007812e+02, 2.932254028320312e+02, 2.932596130371094e+02, 2.932688598632812e+02, 2.932613525390625e+02, 2.932532958984375e+02, 2.932703552246094e+02, 2.932916259765625e+02, 2.933006286621094e+02, 2.932594299316406e+02, 2.931375732421875e+02, 2.930562744140625e+02, 2.930196533203125e+02, 2.930742492675781e+02, 2.93080078125e+02, 2.930720825195312e+02, 2.930639343261719e+02, 2.92965576171875e+02, 2.930472106933594e+02, 2.930875854492188e+02, 2.930808410644531e+02, 2.930681457519531e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.20201708984375e+03, 5.17715478515625e+03, 5.2547802734375e+03, 4.46233740234375e+03, 4.7382666015625e+03, 4.8950302734375e+03, 5.013068359375e+03, 4.346478027343749e+03, 3.797909912109375e+03, 3.6442529296875e+03, 3.623126708984375e+03, 3.603502197265625e+03, 3.503537353515625e+03, 3.43550146484375e+03, 3.36528955078125e+03, 3.302672607421875e+03, 3.333591064453125e+03, 3.292964111328125e+03, 3.12983935546875e+03, 5.5775380859375e+03, 3.9952939453125e+03, 3.342094970703125e+03, 3.028721435546875e+03, 2.924011474609375e+03, 2.93195849609375e+03, 2.913839111328125e+03, 2.847402099609375e+03, 2.789449951171875e+03, 2.7779755859375e+03, 2.760609375e+03, 2.597910888671875e+03, 2.42890380859375e+03, 2.4930087890625e+03, 2.533532958984375e+03, 2.5557841796875e+03, 2.568972900390625e+03, 2.57265283203125e+03, 2.580077880859375e+03, 2.64726708984375e+03, 2.7123564453125e+03, 2.7665869140625e+03, 2.8186142578125e+03, 2.754705078125e+03, 3.233087890625e+03, 2.928472900390625e+03, 2.865656005859375e+03, 2.866337646484375e+03, 2.8674873046875e+03, 2.85785986328125e+03, 2.83490087890625e+03, 2.818181640625e+03, 2.82062548828125e+03, 2.833682373046875e+03, 4.39619873046875e+03, 3.193826171875e+03, 3.0231171875e+03, 3.032060546875e+03, 3.0841806640625e+03, 3.139971923828125e+03, 3.17084130859375e+03, 3.1373759765625e+03, 3.0971015625e+03, 3.06340625e+03, 3.055400390625e+03, 3.053078857421875e+03, 3.010671875e+03, 2.906221435546875e+03, 2.879251953125e+03, 2.9387548828125e+03, 4.528652832031238e+03, 3.17470727539063e+03, 2.845803955078125e+03, 2.72681201171875e+03, 2.663227294921875e+03, 2.575211669921875e+03, 2.52378564453125e+03, 2.54669677734375e+03, 2.59080810546875e+03, 2.734192626953125e+03, 2.852154541015625e+03, 2.74913427734375e+03, 2.68420361328125e+03, 2.610195068359375e+03, 2.54805615234375e+03, 2.6512978515625e+03, 2.908369140625e+03, 3.12270703125e+03, 3.314404541015625e+03, 3.340613525390625e+03, 3.34516259765625e+03, 3.42197998046875e+03, 4.721203125e+03, 4.1640517578125e+03, 3.98570849609375e+03, 3.970441650390625e+03, 3.851083740234375e+03, 5.0192958984375e+03, 4.807021484375e+03, 4.5170341796875e+03, 4.4554755859375e+03, 4.5118193359375e+03]
+electricalGrid.PElecLoa=[4.20201708984375e+03, 5.1771630859375e+03, 5.254724609375e+03, 4.46233740234375e+03, 4.73855859375e+03, 4.89533154296875e+03, 5.01335498046875e+03, 4.342137695312499e+03, 3.79538232421875e+03, 3.642381591796875e+03, 3.62143896484375e+03, 3.601811767578125e+03, 3.50182958984375e+03, 3.43377490234375e+03, 3.363595458984375e+03, 3.3010302734375e+03, 3.331977783203125e+03, 3.29140380859375e+03, 3.128551025390625e+03, 5.577486328125e+03, 3.993323486328125e+03, 3.34058349609375e+03, 3.027501953125e+03, 2.922829833984375e+03, 2.930748046875e+03, 2.91257421875e+03, 2.84608935546875e+03, 2.7880390625e+03, 2.7765615234375e+03, 2.759449951171875e+03, 2.596834228515625e+03, 2.427859619140625e+03, 2.49199560546875e+03, 2.532523681640625e+03, 2.55476611328125e+03, 2.567917236328125e+03, 2.571553466796875e+03, 2.578949462890625e+03, 2.646091552734375e+03, 2.71114599609375e+03, 2.7653359375e+03, 2.81708837890625e+03, 2.7534287109375e+03, 3.23116650390625e+03, 2.92676611328125e+03, 2.863969970703125e+03, 2.864597412109375e+03, 2.865695556640625e+03, 2.85603662109375e+03, 2.833055908203125e+03, 2.816315673828125e+03, 2.818735595703125e+03, 2.83176708984375e+03, 4.3912783203125e+03, 3.191271240234375e+03, 3.02096240234375e+03, 3.029984619140625e+03, 3.08208349609375e+03, 3.13783203125e+03, 3.168663330078125e+03, 3.135177734375e+03, 3.094888427734375e+03, 3.0611806640625e+03, 3.053166259765625e+03, 3.050859375e+03, 3.008496337890625e+03, 2.904114013671875e+03, 2.877201904296875e+03, 2.9367431640625e+03, 4.524549316406238e+03, 3.172451171875005e+03, 2.84385302734375e+03, 2.72526220703125e+03, 2.662166748046875e+03, 2.58107666015625e+03, 2.531797119140625e+03, 2.551657470703125e+03, 2.590986572265625e+03, 2.73110107421875e+03, 2.844921142578125e+03, 2.736863037109375e+03, 2.66420166015625e+03, 2.58588623046875e+03, 2.524927734375e+03, 2.63246142578125e+03, 2.89107861328125e+03, 3.106572021484375e+03, 3.294541748046875e+03, 3.31795556640625e+03, 3.322872802734375e+03, 3.401698974609375e+03, 4.71401025390625e+03, 4.14060791015625e+03, 3.957178466796875e+03, 3.9434033203125e+03, 3.82752587890625e+03, 5.01880419921875e+03, 4.806169921875e+03, 4.50419775390625e+03, 4.4353974609375e+03, 4.49127587890625e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt
index 30014a98..bb507c2d 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "0, 0, 5, 7, 2, 1, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.017698669433594e+02, 3.120101318359375e+02, 3.182154846191406e+02, 3.221028442382812e+02, 3.227921752929688e+02, 3.228874206542969e+02, 3.22838134765625e+02, 3.228057861328125e+02, 3.227963256835938e+02, 3.227945556640625e+02, 3.227640686035156e+02, 3.226025085449219e+02, 3.224313354492188e+02, 3.222848510742188e+02, 3.2508935546875e+02, 3.221360168457031e+02, 3.222905883789062e+02, 3.219402465820312e+02, 3.216713562011719e+02, 3.21771728515625e+02, 3.218311767578125e+02, 3.215950622558594e+02, 3.213443298339844e+02, 3.212306823730469e+02, 3.211276245117188e+02, 3.209443969726562e+02, 3.207335205078125e+02, 3.20602783203125e+02, 3.205212707519531e+02, 3.199533386230469e+02, 3.196773681640625e+02, 3.194783325195312e+02, 3.194317626953125e+02, 3.194632568359375e+02, 3.1951171875e+02, 3.195483703613281e+02, 3.195700378417969e+02, 3.197206115722656e+02, 3.199207763671875e+02, 3.201242370605469e+02, 3.203298034667969e+02, 3.205249328613281e+02, 3.284526062011719e+02, 3.207954711914062e+02, 3.208837890625e+02, 3.208471069335938e+02, 3.208246154785156e+02, 3.208027038574219e+02, 3.207544555664062e+02, 3.206997985839844e+02, 3.206769409179688e+02, 3.235260925292969e+02, 3.2078369140625e+02, 3.209853820800781e+02, 3.211030883789062e+02, 3.212650756835938e+02, 3.214554138183594e+02, 3.216550903320312e+02, 3.218236389160156e+02, 3.218648681640625e+02, 3.218361511230469e+02, 3.217766723632812e+02, 3.217424926757812e+02, 3.217555236816406e+02, 3.2290380859375e+02, 3.215614013671875e+02, 3.215857849121094e+02, 3.215684509277344e+02, 3.215416259765625e+02, 3.214437561035156e+02, 3.213307495117188e+02, 3.211925354003906e+02, 3.210293884277344e+02, 3.20703369140625e+02, 3.203193359375e+02, 3.201289367675781e+02, 3.201414489746094e+02, 3.2048974609375e+02, 3.209612426757812e+02, 3.210924377441406e+02, 3.210844116210938e+02, 3.208696594238281e+02, 3.206972045898438e+02, 3.208982543945312e+02, 3.215743408203125e+02, 3.223169250488281e+02, 3.230821838378906e+02, 3.235929565429688e+02, 3.238736572265625e+02, 3.241162414550781e+02, 3.243680419921875e+02, 3.246314697265625e+02, 3.269544982910156e+02, 3.251630859375e+02, 3.25574462890625e+02, 3.255135803222656e+02, 3.256758422851562e+02, 3.259100646972656e+02, 3.261207885742188e+02, 3.263186645507812e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.875409240722656e+02, 2.884169311523438e+02, 2.889537658691406e+02, 2.892936706542969e+02, 2.89383056640625e+02, 2.8932470703125e+02, 2.892697448730469e+02, 2.8926708984375e+02, 2.8928369140625e+02, 2.893034973144531e+02, 2.893287963867188e+02, 2.893649597167969e+02, 2.894952392578125e+02, 2.898027954101562e+02, 2.900908508300781e+02, 2.902506103515625e+02, 2.905005187988281e+02, 2.906681823730469e+02, 2.908127136230469e+02, 2.908916320800781e+02, 2.9099658203125e+02, 2.911015625e+02, 2.911863098144531e+02, 2.911880798339844e+02, 2.911916809082031e+02, 2.911715393066406e+02, 2.911341552734375e+02, 2.912370300292969e+02, 2.913685913085938e+02, 2.914656677246094e+02, 2.916557006835938e+02, 2.917142333984375e+02, 2.917385559082031e+02, 2.917292785644531e+02, 2.916978149414062e+02, 2.9165869140625e+02, 2.916037292480469e+02, 2.915260009765625e+02, 2.914090576171875e+02, 2.91324462890625e+02, 2.913423156738281e+02, 2.913581237792969e+02, 2.913488464355469e+02, 2.913235473632812e+02, 2.912883605957031e+02, 2.91228759765625e+02, 2.912380981445312e+02, 2.912536010742188e+02, 2.9125e+02, 2.912427673339844e+02, 2.912542419433594e+02, 2.91270263671875e+02, 2.912636413574219e+02, 2.913168640136719e+02, 2.913340759277344e+02, 2.913531799316406e+02, 2.913761901855469e+02, 2.914013366699219e+02, 2.914286499023438e+02, 2.914551391601562e+02, 2.914771118164062e+02, 2.914971618652344e+02, 2.915975952148438e+02, 2.918501586914062e+02, 2.920780029296875e+02, 2.921644897460938e+02, 2.923147888183594e+02, 2.923726501464844e+02, 2.924498901367188e+02, 2.92530029296875e+02, 2.927909545898438e+02, 2.930603637695312e+02, 2.932250671386719e+02, 2.932959594726562e+02, 2.933096618652344e+02, 2.932608642578125e+02, 2.932083740234375e+02, 2.931840209960938e+02, 2.932064208984375e+02, 2.932295227050781e+02, 2.932872619628906e+02, 2.93281982421875e+02, 2.932637939453125e+02, 2.932535400390625e+02, 2.932711486816406e+02, 2.932874755859375e+02, 2.932893676757812e+02, 2.932395935058594e+02, 2.931139526367188e+02, 2.930350952148438e+02, 2.930503234863281e+02, 2.930590209960938e+02, 2.930478820800781e+02, 2.929800720214844e+02, 2.93066650390625e+02, 2.93046875e+02, 2.930501708984375e+02, 2.930636291503906e+02, 2.930587463378906e+02, 2.930518188476562e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.017720642089844e+02, 3.12014404296875e+02, 3.182207946777344e+02, 3.221053466796875e+02, 3.227923889160156e+02, 3.228872985839844e+02, 3.228380737304688e+02, 3.228057861328125e+02, 3.227963562011719e+02, 3.227945861816406e+02, 3.227640686035156e+02, 3.226025390625e+02, 3.224313354492188e+02, 3.222848510742188e+02, 3.250894470214844e+02, 3.2213623046875e+02, 3.222904968261719e+02, 3.219401245117188e+02, 3.216712951660156e+02, 3.217716979980469e+02, 3.218311767578125e+02, 3.215950622558594e+02, 3.213443298339844e+02, 3.21230712890625e+02, 3.211276550292969e+02, 3.209444274902344e+02, 3.207335205078125e+02, 3.206027526855469e+02, 3.20521240234375e+02, 3.199538879394531e+02, 3.196772766113281e+02, 3.19478271484375e+02, 3.194317321777344e+02, 3.194632568359375e+02, 3.1951171875e+02, 3.195483703613281e+02, 3.19570068359375e+02, 3.197206420898438e+02, 3.199208068847656e+02, 3.20124267578125e+02, 3.20329833984375e+02, 3.205250244140625e+02, 3.284526672363281e+02, 3.207955322265625e+02, 3.208837585449219e+02, 3.208471374511719e+02, 3.208246154785156e+02, 3.20802734375e+02, 3.207544555664062e+02, 3.206997985839844e+02, 3.206769409179688e+02, 3.235270385742188e+02, 3.207839965820312e+02, 3.209853210449219e+02, 3.211030578613281e+02, 3.212650756835938e+02, 3.214554443359375e+02, 3.216550903320312e+02, 3.218236389160156e+02, 3.218648986816406e+02, 3.218361511230469e+02, 3.217766723632812e+02, 3.217424926757812e+02, 3.217555236816406e+02, 3.229038696289062e+02, 3.215617065429688e+02, 3.215856628417969e+02, 3.21568359375e+02, 3.215415954589844e+02, 3.214437561035156e+02, 3.213306274414062e+02, 3.211925048828125e+02, 3.210301208496094e+02, 3.207040100097656e+02, 3.203198852539062e+02, 3.2012939453125e+02, 3.201419067382812e+02, 3.204901123046875e+02, 3.209617614746094e+02, 3.210990600585938e+02, 3.210847778320312e+02, 3.208688659667969e+02, 3.206968688964844e+02, 3.208982543945312e+02, 3.215747375488281e+02, 3.22318115234375e+02, 3.23082763671875e+02, 3.235929565429688e+02, 3.23873046875e+02, 3.241156005859375e+02, 3.2436865234375e+02, 3.246315307617188e+02, 3.269546203613281e+02, 3.251767883300781e+02, 3.255762329101562e+02, 3.255116882324219e+02, 3.256755676269531e+02, 3.259100646972656e+02, 3.261207580566406e+02, 3.263185424804688e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.875501098632812e+02, 2.884264221191406e+02, 2.889635620117188e+02, 2.893037719726562e+02, 2.893929443359375e+02, 2.89334716796875e+02, 2.892799987792969e+02, 2.892776184082031e+02, 2.892944641113281e+02, 2.893145446777344e+02, 2.893401184082031e+02, 2.893764953613281e+02, 2.895068359375e+02, 2.898141174316406e+02, 2.90101806640625e+02, 2.902612609863281e+02, 2.905107421875e+02, 2.906779174804688e+02, 2.908220825195312e+02, 2.909010314941406e+02, 2.910060119628906e+02, 2.911110229492188e+02, 2.9119580078125e+02, 2.911981201171875e+02, 2.912023010253906e+02, 2.911827697753906e+02, 2.911460571289062e+02, 2.912488098144531e+02, 2.913800048828125e+02, 2.914767456054688e+02, 2.91666259765625e+02, 2.917245788574219e+02, 2.917489318847656e+02, 2.917399291992188e+02, 2.917090148925781e+02, 2.916704711914062e+02, 2.916161193847656e+02, 2.915388488769531e+02, 2.914220886230469e+02, 2.913376770019531e+02, 2.913556518554688e+02, 2.913717041015625e+02, 2.913625183105469e+02, 2.913374633789062e+02, 2.913028259277344e+02, 2.912439270019531e+02, 2.912534790039062e+02, 2.912691650390625e+02, 2.912657775878906e+02, 2.912587585449219e+02, 2.912704162597656e+02, 2.9128662109375e+02, 2.912802734375e+02, 2.913335876464844e+02, 2.913509826660156e+02, 2.913702697753906e+02, 2.913934631347656e+02, 2.914187622070312e+02, 2.914462585449219e+02, 2.91472900390625e+02, 2.914950256347656e+02, 2.915152282714844e+02, 2.916156311035156e+02, 2.918678283691406e+02, 2.9209521484375e+02, 2.921813354492188e+02, 2.923310241699219e+02, 2.923883666992188e+02, 2.924651184082031e+02, 2.92545166015625e+02, 2.928060607910156e+02, 2.930753173828125e+02, 2.932381286621094e+02, 2.933079528808594e+02, 2.933206176757812e+02, 2.932708435058594e+02, 2.932174377441406e+02, 2.931914978027344e+02, 2.932119750976562e+02, 2.932337341308594e+02, 2.932894592285156e+02, 2.932826538085938e+02, 2.932635498046875e+02, 2.93252685546875e+02, 2.932696228027344e+02, 2.932852478027344e+02, 2.932864685058594e+02, 2.932361755371094e+02, 2.931108093261719e+02, 2.9303271484375e+02, 2.930483703613281e+02, 2.930573425292969e+02, 2.930464782714844e+02, 2.929812927246094e+02, 2.930664672851562e+02, 2.930467529296875e+02, 2.930502319335938e+02, 2.93063720703125e+02, 2.930588989257812e+02, 2.93052001953125e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.20201708984375e+03, 4.4694345703125e+03, 4.46779638671875e+03, 4.81473779296875e+03, 4.97145068359375e+03, 3.8646220703125e+03, 3.660877197265625e+03, 3.5894921875e+03, 3.582838623046875e+03, 3.584656494140625e+03, 3.58557080078125e+03, 3.560153076171875e+03, 3.467745849609375e+03, 3.40613720703125e+03, 3.3313671875e+03, 5.11533056640625e+03, 3.986599853515625e+03, 3.382527832031249e+03, 3.106219970703125e+03, 3.0468984375e+03, 3.1471611328125e+03, 3.127838623046875e+03, 2.992585693359375e+03, 2.92310986328125e+03, 2.92011474609375e+03, 2.892804443359375e+03, 2.8295830078125e+03, 2.77594970703125e+03, 2.7624375e+03, 2.74096728515625e+03, 3.291457275390625e+03, 2.59470556640625e+03, 2.502244873046875e+03, 2.5092626953125e+03, 2.528447509765625e+03, 2.543251220703125e+03, 2.548436279296875e+03, 2.556084228515625e+03, 2.61471875e+03, 2.67014794921875e+03, 2.719424072265625e+03, 2.759202392578125e+03, 2.7981728515625e+03, 5.45473046875e+03, 3.21116650390625e+03, 2.896263427734375e+03, 2.835302001953125e+03, 2.827556884765625e+03, 2.819974853515625e+03, 2.8016787109375e+03, 2.7889658203125e+03, 2.7905439453125e+03, 5.1851708984375e+03, 3.308238525390625e+03, 2.95832568359375e+03, 2.930496337890625e+03, 2.97309619140625e+03, 3.024645751953125e+03, 3.074871826171875e+03, 3.103194580078125e+03, 3.080231689453125e+03, 3.05327783203125e+03, 3.028581787109375e+03, 3.021736572265625e+03, 3.0106533203125e+03, 5.1097919921875e+03, 3.4770439453125e+03, 2.973225341796875e+03, 2.910008056640625e+03, 2.878684814453125e+03, 2.830472412109375e+03, 2.77280615234375e+03, 2.7099912109375e+03, 2.63477392578125e+03, 2.5049248046875e+03, 2.407636962890625e+03, 2.406655029296875e+03, 2.4515947265625e+03, 2.59445703125e+03, 2.678283935546875e+03, 3.017936767578125e+03, 2.571239990234375e+03, 2.468802001953125e+03, 2.4390830078125e+03, 2.550367919921875e+03, 2.740867431640625e+03, 2.879248779296875e+03, 3.025950927734375e+03, 3.060538818359375e+03, 3.13018212890625e+03, 3.240861572265625e+03, 3.326383056640625e+03, 3.436769287109375e+03, 5.14369580078125e+03, 4.835142578125e+03, 3.854007080078125e+03, 3.762649658203125e+03, 3.92897119140625e+03, 4.070297607421875e+03, 4.18237939453125e+03, 4.29715283203125e+03]
+electricalGrid.PElecLoa=[4.20201708984375e+03, 4.4694345703125e+03, 4.46779638671875e+03, 4.81503125e+03, 4.967310546875e+03, 3.862115234375e+03, 3.659177734375e+03, 3.587940673828125e+03, 3.581271484375e+03, 3.583042236328125e+03, 3.583909423828125e+03, 3.558455322265625e+03, 3.466023681640625e+03, 3.404416259765625e+03, 3.3296982421875e+03, 5.11537060546875e+03, 3.984302001953125e+03, 3.380861083984374e+03, 3.104944580078125e+03, 3.045707763671875e+03, 3.145967529296875e+03, 3.126640625e+03, 2.991400146484375e+03, 2.9219326171875e+03, 2.918905517578125e+03, 2.89154296875e+03, 2.828270263671875e+03, 2.774626220703125e+03, 2.7612998046875e+03, 2.73985791015625e+03, 3.289634765625e+03, 2.59350390625e+03, 2.50121533203125e+03, 2.50826171875e+03, 2.527436279296875e+03, 2.54219873046875e+03, 2.547336181640625e+03, 2.55493359375e+03, 2.613518798828125e+03, 2.668923095703125e+03, 2.71817724609375e+03, 2.757935791015625e+03, 2.796595703125e+03, 5.454734375e+03, 3.209210205078125e+03, 2.89451171875e+03, 2.833541259765625e+03, 2.825762939453125e+03, 2.818156005859375e+03, 2.799839111328125e+03, 2.787105712890625e+03, 2.78866015625e+03, 5.18526025390625e+03, 3.305567626953125e+03, 2.956231689453125e+03, 2.928466064453125e+03, 2.97104345703125e+03, 3.0225537109375e+03, 3.07273974609375e+03, 3.1010283203125e+03, 3.078045654296875e+03, 3.051075927734375e+03, 3.026365478515625e+03, 3.019509521484375e+03, 3.0084423828125e+03, 5.109798828125e+03, 3.474027587890625e+03, 2.971056884765625e+03, 2.90801513671875e+03, 2.876769287109375e+03, 2.828589599609375e+03, 2.771228515625e+03, 2.7084794921875e+03, 2.6307578125e+03, 2.49965869140625e+03, 2.401218017578125e+03, 2.39933447265625e+03, 2.443375244140625e+03, 2.58553466796875e+03, 2.6683154296875e+03, 3.000389892578125e+03, 2.55655126953125e+03, 2.456710205078125e+03, 2.4274736328125e+03, 2.538659912109375e+03, 2.728322509765625e+03, 2.862655029296875e+03, 3.00810595703125e+03, 3.042653076171875e+03, 3.113896240234375e+03, 3.22604345703125e+03, 3.31004736328125e+03, 3.41998876953125e+03, 5.14369921875e+03, 4.80174609375e+03, 3.827942626953125e+03, 3.745421875e+03, 3.911445556640625e+03, 4.052102294921875e+03, 4.1639150390625e+03, 4.27866064453125e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt
index 10a51887..d5848e9b 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "0, 0, 5, 7, 4, 1, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090248107910156e+02, 3.168702697753906e+02, 3.217532653808594e+02, 3.226175842285156e+02, 3.226526184082031e+02, 3.227782592773438e+02, 3.227994995117188e+02, 3.227950744628906e+02, 3.227938232421875e+02, 3.227938232421875e+02, 3.227648620605469e+02, 3.226029357910156e+02, 3.224291076660156e+02, 3.222832641601562e+02, 3.221523132324219e+02, 3.221632995605469e+02, 3.221394348144531e+02, 3.218694763183594e+02, 3.271340942382812e+02, 3.219281311035156e+02, 3.220271911621094e+02, 3.216503295898438e+02, 3.213487548828125e+02, 3.212286376953125e+02, 3.211282043457031e+02, 3.209454650878906e+02, 3.2073193359375e+02, 3.206005249023438e+02, 3.205215759277344e+02, 3.201494140625e+02, 3.195390930175781e+02, 3.193984069824219e+02, 3.194100341796875e+02, 3.194603271484375e+02, 3.195122375488281e+02, 3.195492553710938e+02, 3.195695495605469e+02, 3.197196350097656e+02, 3.199216918945312e+02, 3.200027770996094e+02, 3.205206604003906e+02, 3.205909423828125e+02, 3.206534118652344e+02, 3.207066955566406e+02, 3.203235473632812e+02, 3.2078466796875e+02, 3.210531311035156e+02, 3.208778076171875e+02, 3.207674560546875e+02, 3.2069970703125e+02, 3.206758117675781e+02, 3.206871643066406e+02, 3.207352905273438e+02, 3.208519287109375e+02, 3.210462036132812e+02, 3.212505798339844e+02, 3.21453369140625e+02, 3.216551818847656e+02, 3.218248596191406e+02, 3.218658447265625e+02, 3.218356018066406e+02, 3.217757568359375e+02, 3.217409973144531e+02, 3.217548828125e+02, 3.193742980957031e+02, 3.216394958496094e+02, 3.216178283691406e+02, 3.215546264648438e+02, 3.215345764160156e+02, 3.214416809082031e+02, 3.213289794921875e+02, 3.211920471191406e+02, 3.2102197265625e+02, 3.206983337402344e+02, 3.203127136230469e+02, 3.201248779296875e+02, 3.20139892578125e+02, 3.204857177734375e+02, 3.209619140625e+02, 3.210071105957031e+02, 3.209418029785156e+02, 3.208231506347656e+02, 3.205386962890625e+02, 3.210956420898438e+02, 3.216343383789062e+02, 3.223218688964844e+02, 3.230791931152344e+02, 3.235966796875e+02, 3.238815612792969e+02, 3.241184692382812e+02, 3.243663024902344e+02, 3.246326293945312e+02, 3.249971618652344e+02, 3.253211364746094e+02, 3.279804992675781e+02, 3.233953247070312e+02, 3.251112670898438e+02, 3.258213500976562e+02, 3.261360168457031e+02, 3.263204345703125e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.882835693359375e+02, 2.889047241210938e+02, 2.893280639648438e+02, 2.894712219238281e+02, 2.894081420898438e+02, 2.893306579589844e+02, 2.892765197753906e+02, 2.892735290527344e+02, 2.89287841796875e+02, 2.893048095703125e+02, 2.893271789550781e+02, 2.893610229492188e+02, 2.894886779785156e+02, 2.897939453125e+02, 2.900799865722656e+02, 2.90274658203125e+02, 2.904744873046875e+02, 2.906423645019531e+02, 2.907513122558594e+02, 2.908082885742188e+02, 2.909851379394531e+02, 2.910799255371094e+02, 2.91155517578125e+02, 2.911539611816406e+02, 2.911558227539062e+02, 2.911342163085938e+02, 2.910951843261719e+02, 2.911961059570312e+02, 2.913258361816406e+02, 2.914766845703125e+02, 2.916055908203125e+02, 2.916585998535156e+02, 2.916871032714844e+02, 2.916790161132812e+02, 2.916468200683594e+02, 2.916062622070312e+02, 2.915500183105469e+02, 2.914702758789062e+02, 2.9135107421875e+02, 2.911522216796875e+02, 2.91287841796875e+02, 2.913008422851562e+02, 2.91287353515625e+02, 2.912676086425781e+02, 2.912054443359375e+02, 2.910208435058594e+02, 2.911728820800781e+02, 2.911836853027344e+02, 2.911704711914062e+02, 2.911595458984375e+02, 2.911692504882812e+02, 2.911839294433594e+02, 2.911998291015625e+02, 2.912164001464844e+02, 2.912358703613281e+02, 2.912585144042969e+02, 2.912818908691406e+02, 2.913058166503906e+02, 2.913314819335938e+02, 2.913568420410156e+02, 2.913776550292969e+02, 2.913965759277344e+02, 2.914956970214844e+02, 2.917467651367188e+02, 2.919734802246094e+02, 2.92017578125e+02, 2.922092895507812e+02, 2.922619018554688e+02, 2.923369445800781e+02, 2.924172058105469e+02, 2.926783142089844e+02, 2.929470825195312e+02, 2.931190185546875e+02, 2.932037658691406e+02, 2.932290954589844e+02, 2.931916198730469e+02, 2.931478881835938e+02, 2.93130126953125e+02, 2.931594848632812e+02, 2.932079467773438e+02, 2.93244140625e+02, 2.932566833496094e+02, 2.931499938964844e+02, 2.932681579589844e+02, 2.932918701171875e+02, 2.933110046386719e+02, 2.933206787109375e+02, 2.932774047851562e+02, 2.931493530273438e+02, 2.930625610351562e+02, 2.930721435546875e+02, 2.930775756835938e+02, 2.930657653808594e+02, 2.930596923828125e+02, 2.930462646484375e+02, 2.92825439453125e+02, 2.929654235839844e+02, 2.930483093261719e+02, 2.930562438964844e+02, 2.930422973632812e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090269470214844e+02, 3.168741455078125e+02, 3.217583923339844e+02, 3.2261767578125e+02, 3.226524963378906e+02, 3.227782287597656e+02, 3.227994995117188e+02, 3.227950744628906e+02, 3.227938537597656e+02, 3.227938537597656e+02, 3.22764892578125e+02, 3.226029663085938e+02, 3.224291076660156e+02, 3.222832641601562e+02, 3.221522521972656e+02, 3.221632690429688e+02, 3.221394348144531e+02, 3.218694458007812e+02, 3.271341857910156e+02, 3.219284362792969e+02, 3.22027099609375e+02, 3.216502685546875e+02, 3.213487243652344e+02, 3.212286682128906e+02, 3.211282348632812e+02, 3.209454650878906e+02, 3.207318725585938e+02, 3.206005249023438e+02, 3.205215454101562e+02, 3.201493835449219e+02, 3.195390930175781e+02, 3.193984069824219e+02, 3.194100341796875e+02, 3.194603576660156e+02, 3.195122680664062e+02, 3.195492553710938e+02, 3.19569580078125e+02, 3.197196655273438e+02, 3.199217224121094e+02, 3.200033874511719e+02, 3.205206298828125e+02, 3.205908508300781e+02, 3.206534729003906e+02, 3.207067260742188e+02, 3.203206176757812e+02, 3.207854309082031e+02, 3.210530090332031e+02, 3.208777465820312e+02, 3.207674560546875e+02, 3.206996459960938e+02, 3.206758728027344e+02, 3.206872253417969e+02, 3.207353210449219e+02, 3.208519287109375e+02, 3.210462341308594e+02, 3.212506103515625e+02, 3.214533996582031e+02, 3.216552124023438e+02, 3.218248901367188e+02, 3.218658447265625e+02, 3.218356018066406e+02, 3.217757568359375e+02, 3.217409973144531e+02, 3.217548828125e+02, 3.1937548828125e+02, 3.216398620605469e+02, 3.2161767578125e+02, 3.215545654296875e+02, 3.215345458984375e+02, 3.21441650390625e+02, 3.21328857421875e+02, 3.211919860839844e+02, 3.210220031738281e+02, 3.206989135742188e+02, 3.203132629394531e+02, 3.201253356933594e+02, 3.201403198242188e+02, 3.204861145019531e+02, 3.209623718261719e+02, 3.210075378417969e+02, 3.20942138671875e+02, 3.208234252929688e+02, 3.205458984375e+02, 3.2109619140625e+02, 3.216353149414062e+02, 3.2232275390625e+02, 3.230798950195312e+02, 3.235970153808594e+02, 3.23881103515625e+02, 3.241188354492188e+02, 3.243662719726562e+02, 3.246323547363281e+02, 3.249967956542969e+02, 3.2532080078125e+02, 3.279820251464844e+02, 3.234057922363281e+02, 3.251300354003906e+02, 3.258261413574219e+02, 3.261359252929688e+02, 3.281603088378906e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.882925720214844e+02, 2.889140625e+02, 2.893377380371094e+02, 2.894808044433594e+02, 2.894178771972656e+02, 2.893406372070312e+02, 2.892867736816406e+02, 2.892840270996094e+02, 2.892986145019531e+02, 2.893158569335938e+02, 2.893384704589844e+02, 2.8937255859375e+02, 2.895002746582031e+02, 2.898052368164062e+02, 2.900909118652344e+02, 2.902852478027344e+02, 2.904846801757812e+02, 2.906521301269531e+02, 2.907607116699219e+02, 2.908177795410156e+02, 2.909945678710938e+02, 2.910893859863281e+02, 2.911650390625e+02, 2.911640014648438e+02, 2.911664428710938e+02, 2.911454467773438e+02, 2.911070861816406e+02, 2.912079162597656e+02, 2.913372802734375e+02, 2.914877014160156e+02, 2.916161499023438e+02, 2.916690063476562e+02, 2.91697509765625e+02, 2.916896667480469e+02, 2.916580505371094e+02, 2.916180725097656e+02, 2.915624389648438e+02, 2.91483154296875e+02, 2.913641357421875e+02, 2.911656188964844e+02, 2.9130126953125e+02, 2.913143920898438e+02, 2.913010559082031e+02, 2.912815246582031e+02, 2.91219970703125e+02, 2.910363159179688e+02, 2.911883544921875e+02, 2.911993103027344e+02, 2.911863403320312e+02, 2.911755981445312e+02, 2.911855163574219e+02, 2.912003784179688e+02, 2.912164611816406e+02, 2.912332153320312e+02, 2.912528686523438e+02, 2.912756958007812e+02, 2.912992248535156e+02, 2.913233337402344e+02, 2.913491821289062e+02, 2.913746948242188e+02, 2.913956909179688e+02, 2.914147644042969e+02, 2.915138549804688e+02, 2.917645263671875e+02, 2.919907836914062e+02, 2.920345764160156e+02, 2.922256469726562e+02, 2.922777099609375e+02, 2.923522644042969e+02, 2.924324340820312e+02, 2.926934814453125e+02, 2.929622192382812e+02, 2.931340942382812e+02, 2.932172546386719e+02, 2.932418823242188e+02, 2.932037048339844e+02, 2.931593322753906e+02, 2.931402893066406e+02, 2.931679992675781e+02, 2.932147827148438e+02, 2.932492065429688e+02, 2.932603454589844e+02, 2.931556396484375e+02, 2.932702026367188e+02, 2.932925720214844e+02, 2.93310546875e+02, 2.933189697265625e+02, 2.932745666503906e+02, 2.931462707519531e+02, 2.930601196289062e+02, 2.930699462890625e+02, 2.930755004882812e+02, 2.930638427734375e+02, 2.930580444335938e+02, 2.930455932617188e+02, 2.928291015625e+02, 2.929667358398438e+02, 2.930530395507812e+02, 2.930663146972656e+02, 2.930515747070312e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.20362353515625e+03, 4.471041015625e+03, 4.86541064453125e+03, 5.13148388671875e+03, 3.66936572265625e+03, 3.556167236328125e+03, 3.63441650390625e+03, 3.6143056640625e+03, 3.61505859375e+03, 3.6172255859375e+03, 3.6185283203125e+03, 3.590744873046875e+03, 3.494703369140625e+03, 3.43863818359375e+03, 3.36627685546875e+03, 3.307221435546875e+03, 3.33012939453125e+03, 3.27566748046875e+03, 3.125226806640625e+03, 5.43733349609375e+03, 3.807646728515625e+03, 3.183425537109375e+03, 2.995205078125e+03, 2.946872802734375e+03, 2.954909912109375e+03, 2.924976806640625e+03, 2.85731640625e+03, 2.8069931640625e+03, 2.7986298828125e+03, 2.7753720703125e+03, 2.605499755859375e+03, 2.462804443359375e+03, 2.526998291015625e+03, 2.548854248046875e+03, 2.563388671875e+03, 2.57494580078125e+03, 2.578337158203125e+03, 2.5872333984375e+03, 2.650744140625e+03, 2.70470849609375e+03, 3.6070537109375e+03, 2.86196630859375e+03, 2.8160615234375e+03, 2.827759033203125e+03, 2.842254150390625e+03, 5.0497490234375e+03, 3.845266845703125e+03, 2.934046630859375e+03, 2.834384033203125e+03, 2.82601171875e+03, 2.82228125e+03, 2.827476318359375e+03, 2.838045166015625e+03, 2.85895947265625e+03, 2.906783447265625e+03, 2.9704248046875e+03, 3.021210693359375e+03, 3.070188720703125e+03, 3.119541015625e+03, 3.145575927734375e+03, 3.1193564453125e+03, 3.093815673828125e+03, 3.07073486328125e+03, 3.0670380859375e+03, 3.057243408203125e+03, 5.02806640625e+03, 3.548989013671875e+03, 2.935156494140625e+03, 2.93439111328125e+03, 2.917670654296875e+03, 2.86979833984375e+03, 2.814140869140625e+03, 2.750242431640625e+03, 2.68895166015625e+03, 2.5653818359375e+03, 2.479210205078125e+03, 2.486592529296875e+03, 2.535535888671875e+03, 2.69156298828125e+03, 2.7750263671875e+03, 2.68718896484375e+03, 2.644281982421875e+03, 2.5916806640625e+03, 3.473271484375e+03, 2.75255615234375e+03, 2.8825634765625e+03, 3.05272705078125e+03, 3.21664599609375e+03, 3.238412109375e+03, 3.28690234375e+03, 3.392053955078125e+03, 3.488700439453125e+03, 3.598470703125e+03, 3.775531982421875e+03, 3.87162646484375e+03, 4.97945166015625e+03, 3.912188720703125e+03, 4.4374248046875e+03, 4.42291748046875e+03, 4.40739599609375e+03, 4.44775634765625e+03]
+electricalGrid.PElecLoa=[4.20362353515625e+03, 4.471041015625e+03, 4.86562841796875e+03, 5.1317470703125e+03, 3.667279296875e+03, 3.554658447265625e+03, 3.632924072265625e+03, 3.6127666015625e+03, 3.613468017578125e+03, 3.615587646484375e+03, 3.616844970703125e+03, 3.58901171875e+03, 3.492972412109375e+03, 3.436895751953125e+03, 3.36457861328125e+03, 3.305791748046875e+03, 3.32874951171875e+03, 3.27432861328125e+03, 3.12395068359375e+03, 5.4373369140625e+03, 3.805538818359375e+03, 3.182048583984375e+03, 2.993998779296875e+03, 2.94567822265625e+03, 2.953678955078125e+03, 2.923690673828125e+03, 2.855977783203125e+03, 2.805833251953125e+03, 2.79747314453125e+03, 2.774239013671875e+03, 2.604396240234375e+03, 2.461748291015625e+03, 2.52597412109375e+03, 2.5478330078125e+03, 2.56235595703125e+03, 2.573872802734375e+03, 2.57721630859375e+03, 2.586061279296875e+03, 2.649521240234375e+03, 2.703458740234375e+03, 3.604539306640625e+03, 2.86026318359375e+03, 2.81474072265625e+03, 2.82616064453125e+03, 2.840591552734375e+03, 5.049435546875e+03, 3.841983642578125e+03, 2.932056884765625e+03, 2.83252197265625e+03, 2.8241318359375e+03, 2.820719482421875e+03, 2.82558740234375e+03, 2.8360517578125e+03, 2.856962158203125e+03, 2.904754638671875e+03, 2.968353515625e+03, 3.0190986328125e+03, 3.068036376953125e+03, 3.117348876953125e+03, 3.143349853515625e+03, 3.117110595703125e+03, 3.091552734375e+03, 3.068456298828125e+03, 3.06474609375e+03, 3.054982421875e+03, 5.028126953125e+03, 3.54568212890625e+03, 2.932972412109375e+03, 2.932362548828125e+03, 2.915700439453125e+03, 2.867859619140625e+03, 2.812515869140625e+03, 2.748689453125e+03, 2.68734375e+03, 2.561978515625e+03, 2.474649169921875e+03, 2.481083984375e+03, 2.5291884765625e+03, 2.684477294921875e+03, 2.76701611328125e+03, 2.67824658203125e+03, 2.63465771484375e+03, 2.581457763671875e+03, 3.45539599609375e+03, 2.739420654296875e+03, 2.867494384765625e+03, 3.035377685546875e+03, 3.197257568359375e+03, 3.21815087890625e+03, 3.26798291015625e+03, 3.372122802734375e+03, 3.468582763671875e+03, 3.5788359375e+03, 3.756390380859375e+03, 3.853046875e+03, 4.9795185546875e+03, 3.89054052734375e+03, 4.4003681640625e+03, 4.41379443359375e+03, 4.4021318359375e+03, 1.6460078125e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt
index 2276980f..e8532771 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt
@@ -1,7 +1,7 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
- "linear": "0, 0, 0, 0, 0, 0",
+ "linear": "0",
"nonlinear": "0, 0, 5, 7, 2, 0, 0, 1, 1",
"numerical Jacobians": "0"
}
@@ -14,7 +14,7 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090487670898438e+02, 3.168935852050781e+02, 3.217958679199219e+02, 3.226178894042969e+02, 3.226543884277344e+02, 3.227796020507812e+02, 3.227996520996094e+02, 3.227951049804688e+02, 3.227938232421875e+02, 3.227938232421875e+02, 3.227648315429688e+02, 3.226026916503906e+02, 3.224290466308594e+02, 3.222830505371094e+02, 3.221512756347656e+02, 3.221631774902344e+02, 3.221392822265625e+02, 3.218690490722656e+02, 3.205316467285156e+02, 3.220064392089844e+02, 3.219710998535156e+02, 3.2162939453125e+02, 3.213449401855469e+02, 3.212284545898438e+02, 3.211282043457031e+02, 3.209452514648438e+02, 3.207311096191406e+02, 3.206003112792969e+02, 3.205214233398438e+02, 3.2014892578125e+02, 3.195387878417969e+02, 3.193987121582031e+02, 3.19409912109375e+02, 3.194602355957031e+02, 3.1951220703125e+02, 3.195492248535156e+02, 3.195695190429688e+02, 3.197197875976562e+02, 3.193099365234375e+02, 3.203279418945312e+02, 3.204205017089844e+02, 3.205466003417969e+02, 3.20644287109375e+02, 3.207061462402344e+02, 3.178677368164062e+02, 3.207840881347656e+02, 3.210453186035156e+02, 3.208776245117188e+02, 3.207676391601562e+02, 3.206996154785156e+02, 3.206760559082031e+02, 3.206877136230469e+02, 3.207354736328125e+02, 3.208520202636719e+02, 3.210462951660156e+02, 3.212506408691406e+02, 3.214534606933594e+02, 3.216552734375e+02, 3.218249206542969e+02, 3.218657531738281e+02, 3.218356018066406e+02, 3.217757263183594e+02, 3.217410278320312e+02, 3.217548217773438e+02, 3.193630065917969e+02, 3.216268310546875e+02, 3.216121215820312e+02, 3.215553283691406e+02, 3.215350036621094e+02, 3.214416809082031e+02, 3.21328125e+02, 3.211915893554688e+02, 3.210218811035156e+02, 3.206968994140625e+02, 3.203115234375e+02, 3.201242980957031e+02, 3.201394653320312e+02, 3.204855651855469e+02, 3.20961181640625e+02, 3.210057678222656e+02, 3.209409484863281e+02, 3.208223571777344e+02, 3.2053466796875e+02, 3.21086669921875e+02, 3.216329650878906e+02, 3.223208618164062e+02, 3.230783386230469e+02, 3.235964660644531e+02, 3.238833618164062e+02, 3.241200561523438e+02, 3.243671264648438e+02, 3.246333618164062e+02, 3.249982299804688e+02, 3.253220825195312e+02, 3.3025048828125e+02, 3.254267578125e+02, 3.257269287109375e+02, 3.259378662109375e+02, 3.261300659179688e+02, 3.263252258300781e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.882675476074219e+02, 2.88887451171875e+02, 2.893132629394531e+02, 2.894578552246094e+02, 2.8939599609375e+02, 2.893182678222656e+02, 2.892637939453125e+02, 2.892604370117188e+02, 2.892743835449219e+02, 2.892909545898438e+02, 2.8931298828125e+02, 2.893466491699219e+02, 2.894740295410156e+02, 2.897789306640625e+02, 2.900645446777344e+02, 2.902587890625e+02, 2.904581909179688e+02, 2.906260070800781e+02, 2.905675964355469e+02, 2.908322143554688e+02, 2.909649353027344e+02, 2.910594177246094e+02, 2.911369018554688e+02, 2.911359252929688e+02, 2.911376647949219e+02, 2.911159973144531e+02, 2.910768737792969e+02, 2.91177490234375e+02, 2.913068237304688e+02, 2.914577026367188e+02, 2.915869750976562e+02, 2.916394958496094e+02, 2.916674499511719e+02, 2.916590576171875e+02, 2.916267395019531e+02, 2.915860900878906e+02, 2.915297546386719e+02, 2.9144970703125e+02, 2.912003784179688e+02, 2.912362365722656e+02, 2.91266845703125e+02, 2.912727355957031e+02, 2.912630615234375e+02, 2.912447204589844e+02, 2.911827087402344e+02, 2.909937438964844e+02, 2.911466979980469e+02, 2.9115966796875e+02, 2.911466979980469e+02, 2.911355590820312e+02, 2.911450805664062e+02, 2.911595458984375e+02, 2.911752014160156e+02, 2.911914672851562e+02, 2.912105712890625e+02, 2.9123291015625e+02, 2.912559814453125e+02, 2.912796630859375e+02, 2.913050842285156e+02, 2.913303527832031e+02, 2.913511047363281e+02, 2.913699340820312e+02, 2.914688720703125e+02, 2.917196350097656e+02, 2.919461669921875e+02, 2.919847717285156e+02, 2.921792602539062e+02, 2.922334899902344e+02, 2.923085021972656e+02, 2.923887329101562e+02, 2.92649658203125e+02, 2.929185791015625e+02, 2.930906372070312e+02, 2.931789245605469e+02, 2.932068176269531e+02, 2.931714477539062e+02, 2.931292114257812e+02, 2.931125183105469e+02, 2.931431884765625e+02, 2.931940307617188e+02, 2.932328186035156e+02, 2.932479248046875e+02, 2.931367492675781e+02, 2.932606506347656e+02, 2.932894897460938e+02, 2.933121337890625e+02, 2.933251037597656e+02, 2.932850036621094e+02, 2.931575317382812e+02, 2.930693359375e+02, 2.930779418945312e+02, 2.93082763671875e+02, 2.930701293945312e+02, 2.930632934570312e+02, 2.930482788085938e+02, 2.930115356445312e+02, 2.930487976074219e+02, 2.930615234375e+02, 2.930521545410156e+02, 2.930361022949219e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090508728027344e+02, 3.168974304199219e+02, 3.218009338378906e+02, 3.226180114746094e+02, 3.226542663574219e+02, 3.227795715332031e+02, 3.227996520996094e+02, 3.227951354980469e+02, 3.227938537597656e+02, 3.227938232421875e+02, 3.227648620605469e+02, 3.226026611328125e+02, 3.224290466308594e+02, 3.22282958984375e+02, 3.221512451171875e+02, 3.221631469726562e+02, 3.221392822265625e+02, 3.218690185546875e+02, 3.205345153808594e+02, 3.220065002441406e+02, 3.219710083007812e+02, 3.216293640136719e+02, 3.213449401855469e+02, 3.212284851074219e+02, 3.211282348632812e+02, 3.209452819824219e+02, 3.207310791015625e+02, 3.206003112792969e+02, 3.205214233398438e+02, 3.201488952636719e+02, 3.195387878417969e+02, 3.193987121582031e+02, 3.19409912109375e+02, 3.194602355957031e+02, 3.1951220703125e+02, 3.195492553710938e+02, 3.195695495605469e+02, 3.197198181152344e+02, 3.193108215332031e+02, 3.203279724121094e+02, 3.2042041015625e+02, 3.205465698242188e+02, 3.20644287109375e+02, 3.207062377929688e+02, 3.178678588867188e+02, 3.207847595214844e+02, 3.210452270507812e+02, 3.208774719238281e+02, 3.20767578125e+02, 3.206996154785156e+02, 3.206760559082031e+02, 3.206878051757812e+02, 3.207355346679688e+02, 3.208520202636719e+02, 3.210463256835938e+02, 3.212506408691406e+02, 3.214534606933594e+02, 3.216553039550781e+02, 3.21824951171875e+02, 3.218657836914062e+02, 3.218356323242188e+02, 3.217757568359375e+02, 3.217410278320312e+02, 3.217547912597656e+02, 3.193630981445312e+02, 3.216272277832031e+02, 3.216119689941406e+02, 3.215552673339844e+02, 3.215349731445312e+02, 3.21441650390625e+02, 3.213280029296875e+02, 3.211915283203125e+02, 3.210218505859375e+02, 3.206973876953125e+02, 3.203120727539062e+02, 3.201247863769531e+02, 3.201398620605469e+02, 3.204859008789062e+02, 3.209616088867188e+02, 3.210061950683594e+02, 3.209412841796875e+02, 3.208226623535156e+02, 3.205408325195312e+02, 3.2108740234375e+02, 3.216339721679688e+02, 3.223217468261719e+02, 3.230791625976562e+02, 3.235968933105469e+02, 3.238829956054688e+02, 3.241204528808594e+02, 3.243670959472656e+02, 3.246331176757812e+02, 3.249978942871094e+02, 3.253218078613281e+02, 3.302505798339844e+02, 3.254320373535156e+02, 3.2572900390625e+02, 3.259380798339844e+02, 3.261297912597656e+02, 3.263216552734375e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.882765197753906e+02, 2.888967895507812e+02, 2.893229370117188e+02, 2.894674682617188e+02, 2.8940576171875e+02, 2.893282775878906e+02, 2.892740478515625e+02, 2.892709655761719e+02, 2.8928515625e+02, 2.89302001953125e+02, 2.893242797851562e+02, 2.893581848144531e+02, 2.894856567382812e+02, 2.897902526855469e+02, 2.900755310058594e+02, 2.902693786621094e+02, 2.904683837890625e+02, 2.906358032226562e+02, 2.905771179199219e+02, 2.908416442871094e+02, 2.90974365234375e+02, 2.910688781738281e+02, 2.911464233398438e+02, 2.911459655761719e+02, 2.911483154296875e+02, 2.911272583007812e+02, 2.910887756347656e+02, 2.911893310546875e+02, 2.913182983398438e+02, 2.9146875e+02, 2.915975646972656e+02, 2.9164990234375e+02, 2.916778869628906e+02, 2.916697387695312e+02, 2.916380004882812e+02, 2.91597900390625e+02, 2.915421752929688e+02, 2.914626159667969e+02, 2.912135620117188e+02, 2.912495422363281e+02, 2.912802429199219e+02, 2.912862854003906e+02, 2.912767639160156e+02, 2.912586364746094e+02, 2.91197265625e+02, 2.910092163085938e+02, 2.911621704101562e+02, 2.911753234863281e+02, 2.911625671386719e+02, 2.911516418457031e+02, 2.911613464355469e+02, 2.91176025390625e+02, 2.911918640136719e+02, 2.912083129882812e+02, 2.912275695800781e+02, 2.912500915527344e+02, 2.912733764648438e+02, 2.912972106933594e+02, 2.913227844238281e+02, 2.913482360839844e+02, 2.913691711425781e+02, 2.913881530761719e+02, 2.91487060546875e+02, 2.917374267578125e+02, 2.919635009765625e+02, 2.920018005371094e+02, 2.921956481933594e+02, 2.922493286132812e+02, 2.923238525390625e+02, 2.924040222167969e+02, 2.926649169921875e+02, 2.929338684082031e+02, 2.931059265136719e+02, 2.931929626464844e+02, 2.932201843261719e+02, 2.931842041015625e+02, 2.931413879394531e+02, 2.931234436035156e+02, 2.931525268554688e+02, 2.932017517089844e+02, 2.932388305664062e+02, 2.932525329589844e+02, 2.931435241699219e+02, 2.932637329101562e+02, 2.932911682128906e+02, 2.933125305175781e+02, 2.933241577148438e+02, 2.932826843261719e+02, 2.931548461914062e+02, 2.930671691894531e+02, 2.93075927734375e+02, 2.930807800292969e+02, 2.930682678222656e+02, 2.930616455078125e+02, 2.930476989746094e+02, 2.930121459960938e+02, 2.9304931640625e+02, 2.930618286132812e+02, 2.93052490234375e+02, 2.930416564941406e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[4.20362744140625e+03, 4.471044921875e+03, 4.847287109375e+03, 5.1147333984375e+03, 3.637419921875e+03, 3.521126953125e+03, 3.5953017578125e+03, 3.575740966796875e+03, 3.57644921875e+03, 3.5786328125e+03, 3.5799931640625e+03, 3.552403564453125e+03, 3.4579052734375e+03, 3.40240380859375e+03, 3.3312392578125e+03, 3.276461669921875e+03, 3.299012939453125e+03, 3.245068603515625e+03, 3.096777587890625e+03, 5.07842236328125e+03, 3.46897900390625e+03, 3.127746337890625e+03, 2.973083251953125e+03, 2.923095947265625e+03, 2.92881494140625e+03, 2.8988134765625e+03, 2.832078369140625e+03, 2.784881591796875e+03, 2.776739990234375e+03, 2.753713623046875e+03, 2.5853125e+03, 2.44426953125e+03, 2.506927978515625e+03, 2.529224365234375e+03, 2.543919189453125e+03, 2.55545458984375e+03, 2.558793212890625e+03, 2.567755615234375e+03, 2.630581787109375e+03, 4.09625048828125e+03, 2.88644677734375e+03, 2.76573095703125e+03, 2.799524658203125e+03, 2.8099501953125e+03, 2.81963916015625e+03, 4.94146337890625e+03, 3.786684326171875e+03, 2.916386962890625e+03, 2.81301123046875e+03, 2.80405029296875e+03, 2.80082861328125e+03, 2.805243408203125e+03, 2.814146484375e+03, 2.834767822265625e+03, 2.882228271484375e+03, 2.945217529296875e+03, 2.995615966796875e+03, 3.044125732421875e+03, 3.092972412109375e+03, 3.118593505859375e+03, 3.092765869140625e+03, 3.067318359375e+03, 3.044424560546875e+03, 3.0407529296875e+03, 3.0312001953125e+03, 5.08237158203125e+03, 3.512428466796875e+03, 2.918014404296875e+03, 2.91139111328125e+03, 2.8934345703125e+03, 2.846165771484375e+03, 2.7932861328125e+03, 2.730447021484375e+03, 2.6695361328125e+03, 2.550340087890625e+03, 2.467130859375e+03, 2.4753916015625e+03, 2.5249326171875e+03, 2.680850830078125e+03, 2.765341796875e+03, 2.6814091796875e+03, 2.640205322265625e+03, 2.589394775390625e+03, 3.4439228515625e+03, 2.7613896484375e+03, 2.88910546875e+03, 3.06073193359375e+03, 3.22766455078125e+03, 3.2516650390625e+03, 3.29487451171875e+03, 3.39584423828125e+03, 3.49084130859375e+03, 3.59869287109375e+03, 3.772313720703125e+03, 3.865770751953125e+03, 5.09802197265625e+03, 4.211849609375e+03, 4.1171201171875e+03, 4.19758642578125e+03, 4.30052685546875e+03, 4.40503173828125e+03]
+electricalGrid.PElecLoa=[4.20362744140625e+03, 4.471044921875e+03, 4.847501953125e+03, 5.1149931640625e+03, 3.635391845703125e+03, 3.51963818359375e+03, 3.5938310546875e+03, 3.57422607421875e+03, 3.5748837890625e+03, 3.5770205078125e+03, 3.57833642578125e+03, 3.55071142578125e+03, 3.456280517578125e+03, 3.4007021484375e+03, 3.329689208984375e+03, 3.27506103515625e+03, 3.297648681640625e+03, 3.24374560546875e+03, 3.09551611328125e+03, 5.07856494140625e+03, 3.4672451171875e+03, 3.12650048828125e+03, 2.9718974609375e+03, 2.9219130859375e+03, 2.9275986328125e+03, 2.8975439453125e+03, 2.830757080078125e+03, 2.783749755859375e+03, 2.775597412109375e+03, 2.75258984375e+03, 2.584221923828125e+03, 2.443223388671875e+03, 2.505903564453125e+03, 2.528210693359375e+03, 2.542896240234375e+03, 2.554392578125e+03, 2.557683349609375e+03, 2.566595458984375e+03, 2.62937109375e+03, 4.09356982421875e+03, 2.8847431640625e+03, 2.76443310546875e+03, 2.798231201171875e+03, 2.8086337890625e+03, 2.8180322265625e+03, 4.94146728515625e+03, 3.783546630859375e+03, 2.914451416015625e+03, 2.8114609375e+03, 2.802537841796875e+03, 2.7992919921875e+03, 2.80368310546875e+03, 2.812370361328125e+03, 2.83279736328125e+03, 2.880218017578125e+03, 2.943169921875e+03, 2.99352978515625e+03, 3.042e+03, 3.090807373046875e+03, 3.11639501953125e+03, 3.090547607421875e+03, 3.065083251953125e+03, 3.042174072265625e+03, 3.0384892578125e+03, 3.028966552734375e+03, 5.082373046875e+03, 3.5092119140625e+03, 2.91586279296875e+03, 2.9093857421875e+03, 2.8914873046875e+03, 2.84425e+03, 2.79168603515625e+03, 2.728918212890625e+03, 2.66798828125e+03, 2.54740625e+03, 2.463005126953125e+03, 2.47034521484375e+03, 2.51910205078125e+03, 2.674340576171875e+03, 2.757969482421875e+03, 2.67311083984375e+03, 2.631214599609375e+03, 2.579774169921875e+03, 3.428507568359375e+03, 2.74894189453125e+03, 2.87448779296875e+03, 3.043897705078125e+03, 3.208783935546875e+03, 3.23142431640625e+03, 3.275771240234375e+03, 3.375390869140625e+03, 3.470294921875e+03, 3.5785654296875e+03, 3.7526376953125e+03, 3.846533935546875e+03, 5.098025390625e+03, 4.193751953125e+03, 4.09529638671875e+03, 4.17628271484375e+03, 4.27993359375e+03, 4.393884765625e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt
index eb927d36..1dda3512 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt
@@ -1,4 +1,4 @@
-last-generated=2024-07-01
+last-generated=2024-07-16
statistics-initialization=
{
"linear": "0",
@@ -13,11 +13,11 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 8.64e+05]
-electrical.distribution.batterySimple.PLoad=[2.135427001953125e+03, 4.47995361328125e+03, 4.46833056640625e+03, 4.36281494140625e+03, 4.20900390625e+03, 6.30185498046875e+03, 3.56653466796875e+03, 3.5011611328125e+03, 3.720252685546875e+03, 3.834575927734375e+03, 3.79071484375e+03, 3.942838623046875e+03, 4.077826171875e+03, 3.950693359375e+03, 3.709188232421874e+03, 3.73304638671875e+03, 2.633401123046875e+03, 2.938392578125e+03, 3.62526123046875e+03, 4.13344921875e+03, 4.62547314453125e+03, 4.75055615234375e+03, 4.63270849609375e+03, 4.51950634765625e+03, 4.6438115234375e+03, 6.424775390625e+03, 2.496562255859375e+03, 2.955569335937501e+03, 3.707226806640626e+03, 4.12660498046875e+03, 4.048317138671875e+03, 4.19738330078125e+03, 3.997242431640625e+03, 3.667635009765625e+03, 3.136692626953125e+03, 4.16498486328125e+03, 2.480868896484375e+03, 2.37273681640625e+03, 2.49392236328125e+03, 2.5768193359375e+03, 2.656386962890625e+03, 2.686499267578125e+03, 2.650428955078125e+03, 2.475436767578125e+03, 2.0770732421875e+03, 2.531997802734375e+03, 1.790302124023438e+03, 1.790155517578125e+03, 2.0503271484375e+03, 2.24723974609375e+03, 5.22676220703125e+03, 2.2562314453125e+03, 2.20314453125e+03, 1.9716376953125e+03, 1.558156982421873e+03, 1.824257202148403e+03, 1.373240478515624e+03, 1.349212280273438e+03, 1.612211669921873e+03, 1.740629516601562e+03, 1.891625732421875e+03, 1.839836303710938e+03, 1.957431640625e+03, 4.514421875e+03, 1.575940795898438e+03, 1.264509887695312e+03, 1.305475219726562e+03, 1.120994186401367e+02, 1.89505078125e+03, 4.126525390625e+03, 2.513596923828125e+03, 2.538822509765625e+03, 2.633843017578125e+03, 4.61169091796875e+03, 1.969733642578125e+03, 1.303910888671875e+03, 1.316678100585938e+03, 1.2876806640625e+03, 1.87595361328125e+03, 4.1624287109375e+03, 2.145264892578125e+03, 2.080975341796875e+03, 2.1121689453125e+03, 4.72302685546875e+03, 1.7528115234375e+03, 1.368743286132812e+03, 1.408338623046875e+03, 1.448330200195312e+03, 1.933385131835938e+03, 4.11730859375e+03, 2.524498046875e+03, 2.4396923828125e+03, 2.571374267578125e+03, 4.6139677734375e+03, 2.263805908203125e+03, 1.324047119140625e+03, 1.373419189453125e+03, 1.916526489257812e+03, 1.675905151367188e+03, 4.25720654296875e+03, 1.675593994140625e+03]
+electrical.distribution.batterySimple.PLoad=[2.135427001953125e+03, 4.48038427734375e+03, 4.4691298828125e+03, 4.3602275390625e+03, 4.20760009765625e+03, 6.3018564453125e+03, 3.564962158203125e+03, 3.499691650390625e+03, 3.7184990234375e+03, 3.83265283203125e+03, 3.7885849609375e+03, 3.940485107421875e+03, 4.075368408203125e+03, 3.94826513671875e+03, 3.699037597656249e+03, 3.7016982421875e+03, 2.619832275390625e+03, 2.929056884765625e+03, 3.61588623046875e+03, 4.1235859375e+03, 4.6146396484375e+03, 4.75779638671875e+03, 4.6501484375e+03, 4.54670947265625e+03, 4.43528271484375e+03, 6.4247412109375e+03, 2.49274755859375e+03, 2.953196777343751e+03, 3.702603515625001e+03, 4.12055126953125e+03, 4.04107470703125e+03, 4.18885888671875e+03, 3.98874951171875e+03, 3.656973388671875e+03, 3.13115087890625e+03, 4.1653515625e+03, 2.47646630859375e+03, 2.36912158203125e+03, 2.48940185546875e+03, 2.571827392578125e+03, 2.650326904296875e+03, 2.679434814453125e+03, 2.642846435546875e+03, 2.465411376953125e+03, 2.0707900390625e+03, 2.526273193359375e+03, 1.786568969726562e+03, 1.786980712890625e+03, 2.046105346679688e+03, 2.24233984375e+03, 5.22706298828125e+03, 2.249717041015625e+03, 2.1964072265625e+03, 1.963016845703125e+03, 1.552773071289061e+03, 1.819095825195278e+03, 1.369634399414062e+03, 1.346271362304688e+03, 1.608577636718748e+03, 1.736755493164062e+03, 1.886291748046875e+03, 1.835259155273438e+03, 1.952498779296875e+03, 4.5144765625e+03, 1.565045776367188e+03, 1.265952514648438e+03, 1.308887817382812e+03, 1.120994186401367e+02, 1.897568359375e+03, 4.12652880859375e+03, 2.508743896484375e+03, 2.533897216796875e+03, 2.633022705078125e+03, 4.61171240234375e+03, 1.961355102539062e+03, 1.305220336914062e+03, 1.320658081054688e+03, 1.293232666015625e+03, 1.870204833984375e+03, 4.16242822265625e+03, 2.14054638671875e+03, 2.076462158203125e+03, 2.1113515625e+03, 4.72304833984375e+03, 1.745663452148438e+03, 1.361332885742188e+03, 1.401757690429688e+03, 1.443909790039062e+03, 1.928893798828125e+03, 4.11730810546875e+03, 2.51965478515625e+03, 2.438783203125e+03, 2.57034033203125e+03, 4.61399169921875e+03, 2.25410888671875e+03, 1.325662475585938e+03, 1.378494262695312e+03, 1.756113525390625e+03, 1.671518310546875e+03, 4.25720849609375e+03, 1.67144775390625e+03]
electrical.distribution.batterySimple.PCharge=[0e+00, 0e+00, 0e+00, 0e+00, 1.373916625976562e+02, 4.424331359863281e+02, 3.614790344238281e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.117859497070343e+02, 1.355197021484375e+03, 4.340064392089844e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.962879486083984e+02, 1.17838671875e+03, 8.831699829101562e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.132767333984375e+02, 3.282506713867188e+02, 3.45608154296875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.848101043701172e+01, 4.093669128417969e+02, 3.108592834472656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.251091918945329e+02, 2.335591125488297e+02, 3.569707031249969e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.269563446044922e+02, 6.538319702148438e+02, 4.359191589355469e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.521343383789062e+02, 1.300943725585938e+03, 2.515860290527344e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.450899047851562e+02, 5.276746826171875e+02, 4.921898803710938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.932261657714844e+02, 1.391678466796875e+03, 7.0428857421875e+02, 0e+00, 0e+00, 0e+00, 0e+00]
-hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.324158935546875e+02, 3.31285888671875e+02, 3.287838745117188e+02, 3.253984680175781e+02, 3.288024597167969e+02, 3.320787658691406e+02, 3.306276550292969e+02, 3.290182800292969e+02, 3.206752014160156e+02, 3.188943481445312e+02, 3.325361938476562e+02, 3.313908996582031e+02, 3.283415832519531e+02, 3.247553405761719e+02, 3.33414306640625e+02, 3.319278564453125e+02, 3.304666748046875e+02, 3.288203430175781e+02, 3.202295532226562e+02, 3.184498596191406e+02, 3.325276184082031e+02, 3.313876342773438e+02, 3.285263671875e+02, 3.250038146972656e+02, 3.299695739746094e+02, 3.320758666992188e+02, 3.306386108398438e+02, 3.290482177734375e+02, 3.20765502929688e+02, 3.189847412109375e+02, 3.325269165039062e+02, 3.313855895996094e+02, 3.284731140136719e+02, 3.249318237304688e+02, 3.335232849121094e+02, 3.320349731445312e+02, 3.30585693359375e+02, 3.289765014648438e+02, 3.206253051757812e+02, 3.188450927734375e+02, 3.325276184082031e+02, 3.313794250488281e+02, 3.28232421875e+02, 3.246143188476562e+02, 3.333856811523438e+02, 3.318667602539062e+02, 3.303650207519531e+02, 3.286611633300781e+02, 3.198681945800781e+02, 3.2044384765625e+02, 3.32455322265625e+02, 3.313084106445312e+02, 3.28146484375e+02, 3.245272521972656e+02, 3.332818908691406e+02, 3.317374572753906e+02, 3.302045288085938e+02, 3.284585876464844e+02, 3.195389404296875e+02, 3.282238159179688e+02, 3.271847534179688e+02, 3.261846923828125e+02, 3.225004272460938e+02, 3.314703979492188e+02, 3.297868347167969e+02, 3.280750122070312e+02, 3.2619287109375e+02, 3.238330383300781e+02, 3.134141235351562e+02, 3.276167297363281e+02, 3.266058349609375e+02, 3.25632568359375e+02, 3.223292846679688e+02, 3.31540283203125e+02, 3.298855590820312e+02, 3.281965942382812e+02, 3.263351745605469e+02, 3.239973754882812e+02, 3.135263977050781e+02, 3.276128234863281e+02, 3.266004028320312e+02, 3.256256713867188e+02, 3.221805114746094e+02, 3.314796752929688e+02, 3.298001708984375e+02, 3.280909423828125e+02, 3.262099304199219e+02, 3.238519592285156e+02, 3.133995056152344e+02, 3.27618408203125e+02, 3.266074829101562e+02, 3.256341857910156e+02, 3.223190612792969e+02, 3.315321044921875e+02, 3.298739318847656e+02, 3.281820373535156e+02, 3.263188171386719e+02, 3.239772338867188e+02, 3.137076721191406e+02, 3.276051025390625e+02]
-hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.212180786132812e+02, 3.212088012695312e+02, 3.214093933105469e+02, 3.209888916015625e+02, 3.158982238769531e+02, 3.195904235839844e+02, 3.188431396484375e+02, 3.193964233398438e+02, 3.200549621582031e+02, 3.200167236328125e+02, 3.203017883300781e+02, 3.211404724121094e+02, 3.210367126464844e+02, 3.209654541015625e+02, 3.194432373046875e+02, 3.209748840332031e+02, 3.213802490234375e+02, 3.239423828125e+02, 3.252083740234375e+02, 3.260706787109375e+02, 3.254591369628906e+02, 3.246849365234375e+02, 3.237217102050781e+02, 3.265161743164062e+02, 3.219005737304688e+02, 3.216014404296875e+02, 3.223946533203125e+02, 3.240307312011719e+02, 3.2503466796875e+02, 3.24409912109375e+02, 3.236948852539062e+02, 3.230567932128906e+02, 3.234303283691406e+02, 3.222493591308594e+02, 3.183075256347656e+02, 3.196488342285156e+02, 3.188019104003906e+02, 3.181051940917969e+02, 3.174376525878906e+02, 3.171963500976562e+02, 3.171128234863281e+02, 3.168662719726562e+02, 3.170023498535156e+02, 3.172291259765625e+02, 3.167228698730469e+02, 3.163240966796875e+02, 3.161105651855469e+02, 3.160719299316406e+02, 3.16107177734375e+02, 3.149780578613281e+02, 3.154870300292969e+02, 3.149855651855469e+02, 3.147172241210938e+02, 3.138975219726562e+02, 3.135088195800782e+02, 3.133309326171875e+02, 3.133806762695312e+02, 3.132249145507812e+02, 3.126752014160156e+02, 3.127221984863281e+02, 3.120770874023438e+02, 3.122515563964844e+02, 3.127204284667969e+02, 3.133255310058594e+02, 3.128136596679688e+02, 3.143326110839844e+02, 3.13962646484375e+02, 3.141999206542969e+02, 3.148293151855469e+02, 3.159743041992188e+02, 3.155686950683594e+02, 3.158112487792969e+02, 3.157803649902344e+02, 3.160188293457031e+02, 3.149610900878906e+02, 3.155105285644531e+02, 3.142392883300781e+02, 3.142092590332031e+02, 3.1374169921875e+02, 3.137513122558594e+02, 3.132081604003906e+02, 3.129958801269531e+02, 3.126703491210938e+02, 3.133313903808594e+02, 3.12690185546875e+02, 3.140552673339844e+02, 3.136625671386719e+02, 3.147835388183594e+02, 3.150120849609375e+02, 3.15304931640625e+02, 3.147729187011719e+02, 3.150426940917969e+02, 3.151403198242188e+02, 3.163287963867188e+02, 3.158452758789062e+02, 3.173148498535156e+02, 3.132345886230469e+02, 3.135290222167969e+02, 3.121973571777344e+02, 3.114513549804688e+02]
-hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.220247497558594e+02, 3.2199365234375e+02, 3.221690979003906e+02, 3.217630920410156e+02, 3.366665649414062e+02, 3.20172119140625e+02, 3.195110473632812e+02, 3.201190795898438e+02, 3.207625732421875e+02, 3.207008361816406e+02, 3.210507507324219e+02, 3.218691101074219e+02, 3.217328186035156e+02, 3.214653930664062e+02, 3.200375671386719e+02, 3.210239868164062e+02, 3.2154541015625e+02, 3.2407861328125e+02, 3.25368896484375e+02, 3.263327331542969e+02, 3.258415832519531e+02, 3.25081298828125e+02, 3.241954956054688e+02, 3.267381591796875e+02, 3.380343017578125e+02, 3.216271362304688e+02, 3.224976806640625e+02, 3.241804809570312e+02, 3.252051086425781e+02, 3.245938415527344e+02, 3.240523071289062e+02, 3.233933715820312e+02, 3.235729675292969e+02, 3.223343200683594e+02, 3.170474853515625e+02, 3.196741638183594e+02, 3.188475646972656e+02, 3.181842956542969e+02, 3.175942687988281e+02, 3.174306640625e+02, 3.17390380859375e+02, 3.171518859863281e+02, 3.171832885742188e+02, 3.172629089355469e+02, 3.170065307617188e+02, 3.163485412597656e+02, 3.161522216796875e+02, 3.161393432617188e+02, 3.162286987304688e+02, 3.270950622558594e+02, 3.156535949707031e+02, 3.15173828125e+02, 3.148207702636719e+02, 3.139150695800781e+02, 3.136847229003906e+02, 3.13353759765625e+02, 3.133827514648438e+02, 3.13263671875e+02, 3.127901916503906e+02, 3.12932373046875e+02, 3.123673095703125e+02, 3.126573181152344e+02, 3.199217529296875e+02, 3.133545532226562e+02, 3.128702087402344e+02, 3.144125671386719e+02, 3.167593994140625e+02, 3.143258056640625e+02, 3.158177185058594e+02, 3.162833862304688e+02, 3.160073547363281e+02, 3.163293762207031e+02, 3.21721923828125e+02, 3.160564575195312e+02, 3.150056762695312e+02, 3.155024719238281e+02, 3.142106018066406e+02, 3.143121643066406e+02, 3.160316467285156e+02, 3.140609130859375e+02, 3.136082763671875e+02, 3.134651489257812e+02, 3.224154663085938e+02, 3.134444274902344e+02, 3.127227478027344e+02, 3.140231628417969e+02, 3.136991577148438e+02, 3.148502502441406e+02, 3.157375183105469e+02, 3.157339477539062e+02, 3.152723388671875e+02, 3.156076049804688e+02, 3.216741027832031e+02, 3.165010986328125e+02, 3.158830871582031e+02, 3.174266967773438e+02, 3.13302978515625e+02, 3.135718078613281e+02, 3.166967163085938e+02, 3.116650390625e+02]
-ventilation.generation.TSup.T=[2.931499938964844e+02, 2.859515991210938e+02, 2.858675231933594e+02, 2.867267150878906e+02, 2.874771118164062e+02, 2.87723876953125e+02, 2.883582458496094e+02, 2.886298217773438e+02, 2.882432556152344e+02, 2.881243896484375e+02, 2.881412048339844e+02, 2.881346740722656e+02, 2.881255798339844e+02, 2.886752014160156e+02, 2.890507507324219e+02, 2.893086547851562e+02, 2.889747924804688e+02, 2.88816650390625e+02, 2.882238159179688e+02, 2.880534973144531e+02, 2.878787841796875e+02, 2.878944396972656e+02, 2.875970764160156e+02, 2.877426452636719e+02, 2.8809619140625e+02, 2.887997741699219e+02, 2.888978881835938e+02, 2.886294250488281e+02, 2.881930541992188e+02, 2.880802001953125e+02, 2.882008666992188e+02, 2.883915405273438e+02, 2.884979858398438e+02, 2.887342529296875e+02, 2.887822570800781e+02, 2.890131225585938e+02, 2.892212219238281e+02, 2.893662414550781e+02, 2.893263244628906e+02, 2.895024719238281e+02, 2.895642700195312e+02, 2.896366271972656e+02, 2.896917114257812e+02, 2.899533081054688e+02, 2.897843627929688e+02, 2.897864074707031e+02, 2.898390197753906e+02, 2.898699951171875e+02, 2.897172241210938e+02, 2.897662048339844e+02, 2.898124084472656e+02, 2.899465637207031e+02, 2.900490417480469e+02, 2.903778381347656e+02, 2.904035034179688e+02, 2.904494934082031e+02, 2.904220886230469e+02, 2.903999633789062e+02, 2.902438049316406e+02, 2.903731689453125e+02, 2.904244995117188e+02, 2.905009155273438e+02, 2.904703979492188e+02, 2.907452697753906e+02, 2.906912231445312e+02, 2.907544555664062e+02, 2.90777587890625e+02, 2.906898193359375e+02, 2.899997863769531e+02, 2.898597106933594e+02, 2.897141723632812e+02, 2.897911376953125e+02, 2.897592468261719e+02, 2.901233825683594e+02, 2.902593994140625e+02, 2.903743896484375e+02, 2.902421875e+02, 2.903054809570312e+02, 2.900029296875e+02, 2.900878601074219e+02, 2.901140747070312e+02, 2.902445678710938e+02, 2.9025537109375e+02, 2.90671875e+02, 2.906780395507812e+02, 2.906279907226562e+02, 2.90366943359375e+02, 2.903052368164062e+02, 2.899090881347656e+02, 2.8979541015625e+02, 2.897880554199219e+02, 2.899022827148438e+02, 2.898206176757812e+02, 2.901926879882812e+02, 2.901647644042969e+02, 2.9035595703125e+02, 2.90578369140625e+02, 2.90369140625e+02, 2.901572265625e+02, 2.904220886230469e+02, 2.905657653808594e+02]
+hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.324158935546875e+02, 3.31285888671875e+02, 3.287838745117188e+02, 3.253984680175781e+02, 3.28802490234375e+02, 3.320787658691406e+02, 3.30627685546875e+02, 3.290182800292969e+02, 3.206752014160156e+02, 3.188943481445312e+02, 3.325361938476562e+02, 3.313908996582031e+02, 3.283415832519531e+02, 3.247553405761719e+02, 3.334142761230469e+02, 3.319278259277344e+02, 3.304666748046875e+02, 3.288203430175781e+02, 3.202294921875e+02, 3.184498291015625e+02, 3.325276184082031e+02, 3.313876342773438e+02, 3.285263671875e+02, 3.250038757324219e+02, 3.299694213867188e+02, 3.320758666992188e+02, 3.306386108398438e+02, 3.290481872558594e+02, 3.207654724121098e+02, 3.189847106933594e+02, 3.325269165039062e+02, 3.313855895996094e+02, 3.284731140136719e+02, 3.249318237304688e+02, 3.335232849121094e+02, 3.320349731445312e+02, 3.30585693359375e+02, 3.289765014648438e+02, 3.206253051757812e+02, 3.188450927734375e+02, 3.32527587890625e+02, 3.313793640136719e+02, 3.282323913574219e+02, 3.246142883300781e+02, 3.333856506347656e+02, 3.3186669921875e+02, 3.30364990234375e+02, 3.286611633300781e+02, 3.198681945800781e+02, 3.204453430175781e+02, 3.324552307128906e+02, 3.313083190917969e+02, 3.281464538574219e+02, 3.245272521972656e+02, 3.332818298339844e+02, 3.317373962402344e+02, 3.302044982910156e+02, 3.284585571289062e+02, 3.195389404296875e+02, 3.282237548828125e+02, 3.271847229003906e+02, 3.261846618652344e+02, 3.2250048828125e+02, 3.314703369140625e+02, 3.297867736816406e+02, 3.280749816894531e+02, 3.261929626464844e+02, 3.238330383300781e+02, 3.134141540527344e+02, 3.2761669921875e+02, 3.266058044433594e+02, 3.256325378417969e+02, 3.223293151855469e+02, 3.315402526855469e+02, 3.298855590820312e+02, 3.281965942382812e+02, 3.263352355957031e+02, 3.239974365234375e+02, 3.135264282226562e+02, 3.276127624511719e+02, 3.266003723144531e+02, 3.256256408691406e+02, 3.221805419921875e+02, 3.314796752929688e+02, 3.298002014160156e+02, 3.280909729003906e+02, 3.262099914550781e+02, 3.238520202636719e+02, 3.133995971679688e+02, 3.276183471679688e+02, 3.26607421875e+02, 3.256341552734375e+02, 3.22319091796875e+02, 3.315321044921875e+02, 3.298739318847656e+02, 3.281820678710938e+02, 3.2631884765625e+02, 3.239772644042969e+02, 3.137077331542969e+02, 3.276050720214844e+02]
+hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.212234497070312e+02, 3.212193603515625e+02, 3.214101867675781e+02, 3.209891357421875e+02, 3.159002380371094e+02, 3.195906982421875e+02, 3.188434448242188e+02, 3.193967895507812e+02, 3.200553283691406e+02, 3.200171508789062e+02, 3.203023071289062e+02, 3.211409301757812e+02, 3.21037109375e+02, 3.209784545898438e+02, 3.194729309082031e+02, 3.209754943847656e+02, 3.2138134765625e+02, 3.239437255859375e+02, 3.252111206054688e+02, 3.260747375488281e+02, 3.255227661132812e+02, 3.248444519042969e+02, 3.239731750488281e+02, 3.267419128417969e+02, 3.219249572753906e+02, 3.216010131835938e+02, 3.223951110839844e+02, 3.240316467285156e+02, 3.2503662109375e+02, 3.244129028320312e+02, 3.237018432617188e+02, 3.230633544921875e+02, 3.2343505859375e+02, 3.222499694824219e+02, 3.183155822753906e+02, 3.196492309570312e+02, 3.188025512695312e+02, 3.181062927246094e+02, 3.174403381347656e+02, 3.172010498046875e+02, 3.171197814941406e+02, 3.168739318847656e+02, 3.170083312988281e+02, 3.172294616699219e+02, 3.167265319824219e+02, 3.163241882324219e+02, 3.161109924316406e+02, 3.160726318359375e+02, 3.161090087890625e+02, 3.149963989257812e+02, 3.154915771484375e+02, 3.149909362792969e+02, 3.147215270996094e+02, 3.138977661132812e+02, 3.135117797851563e+02, 3.133310241699219e+02, 3.133809509277344e+02, 3.132255249023438e+02, 3.126772766113281e+02, 3.127281188964844e+02, 3.120845947265625e+02, 3.122626647949219e+02, 3.127344665527344e+02, 3.133281860351562e+02, 3.128693237304688e+02, 3.144672546386719e+02, 3.129520874023438e+02, 3.141867370605469e+02, 3.148353576660156e+02, 3.1597998046875e+02, 3.155779724121094e+02, 3.158110046386719e+02, 3.157856140136719e+02, 3.16021484375e+02, 3.150111083984375e+02, 3.156703491210938e+02, 3.144630432128906e+02, 3.142075500488281e+02, 3.137497863769531e+02, 3.137579650878906e+02, 3.132186279296875e+02, 3.1299609375e+02, 3.126750183105469e+02, 3.133348999023438e+02, 3.1269091796875e+02, 3.140556030273438e+02, 3.136626586914062e+02, 3.147845458984375e+02, 3.150219116210938e+02, 3.153132019042969e+02, 3.147723999023438e+02, 3.1504296875e+02, 3.151457824707031e+02, 3.163329467773438e+02, 3.159071044921875e+02, 3.17515869140625e+02, 3.132628784179688e+02, 3.13530029296875e+02, 3.122041015625e+02, 3.114570922851562e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.220304565429688e+02, 3.220043334960938e+02, 3.221690063476562e+02, 3.217630920410156e+02, 3.366665954589844e+02, 3.201720886230469e+02, 3.195110473632812e+02, 3.201191101074219e+02, 3.207626037597656e+02, 3.207008666992188e+02, 3.2105078125e+02, 3.21869140625e+02, 3.217327880859375e+02, 3.214664001464844e+02, 3.2005322265625e+02, 3.21023193359375e+02, 3.215454711914062e+02, 3.24078369140625e+02, 3.253689880371094e+02, 3.263327026367188e+02, 3.259008178710938e+02, 3.252271423339844e+02, 3.244246215820312e+02, 3.268672180175781e+02, 3.380340270996094e+02, 3.2162646484375e+02, 3.224979248046875e+02, 3.241805419921875e+02, 3.25205322265625e+02, 3.245938415527344e+02, 3.240528259277344e+02, 3.233933715820312e+02, 3.235732116699219e+02, 3.223338317871094e+02, 3.170519714355469e+02, 3.196739501953125e+02, 3.188477172851562e+02, 3.181842041015625e+02, 3.175943908691406e+02, 3.174307250976562e+02, 3.17390380859375e+02, 3.171519165039062e+02, 3.17183837890625e+02, 3.172622375488281e+02, 3.170086059570312e+02, 3.163483276367188e+02, 3.161524047851562e+02, 3.161393127441406e+02, 3.162288208007812e+02, 3.27097412109375e+02, 3.156535949707031e+02, 3.151738586425781e+02, 3.148212280273438e+02, 3.139145812988281e+02, 3.136863403320312e+02, 3.133535766601562e+02, 3.133828430175781e+02, 3.132635803222656e+02, 3.12790283203125e+02, 3.129327697753906e+02, 3.123673095703125e+02, 3.126573791503906e+02, 3.199223937988281e+02, 3.13354248046875e+02, 3.12927978515625e+02, 3.145489501953125e+02, 3.167363586425781e+02, 3.143155822753906e+02, 3.158177490234375e+02, 3.162833251953125e+02, 3.160072937011719e+02, 3.163290405273438e+02, 3.217222290039062e+02, 3.160569763183594e+02, 3.150589294433594e+02, 3.15664306640625e+02, 3.144356689453125e+02, 3.143094787597656e+02, 3.160316467285156e+02, 3.14060791015625e+02, 3.136082458496094e+02, 3.134651794433594e+02, 3.224157409667969e+02, 3.134449157714844e+02, 3.127226867675781e+02, 3.140229797363281e+02, 3.136989440917969e+02, 3.1485009765625e+02, 3.157375183105469e+02, 3.157338256835938e+02, 3.152716979980469e+02, 3.156076354980469e+02, 3.216744079589844e+02, 3.165018920898438e+02, 3.159488525390625e+02, 3.176310729980469e+02, 3.133939208984375e+02, 3.135718994140625e+02, 3.166967468261719e+02, 3.116649475097656e+02]
+ventilation.generation.TSup.T=[2.931499938964844e+02, 2.859595031738281e+02, 2.858770141601562e+02, 2.867355346679688e+02, 2.874845275878906e+02, 2.877322387695312e+02, 2.883668212890625e+02, 2.886384582519531e+02, 2.8825341796875e+02, 2.881354370117188e+02, 2.881533508300781e+02, 2.881475219726562e+02, 2.881389770507812e+02, 2.886881408691406e+02, 2.890563659667969e+02, 2.893076477050781e+02, 2.889724426269531e+02, 2.888162231445312e+02, 2.882241821289062e+02, 2.880540771484375e+02, 2.878791809082031e+02, 2.87897705078125e+02, 2.876038513183594e+02, 2.877491149902344e+02, 2.88089599609375e+02, 2.887925720214844e+02, 2.888961791992188e+02, 2.886296691894531e+02, 2.881936950683594e+02, 2.880809631347656e+02, 2.882016296386719e+02, 2.883922424316406e+02, 2.88498291015625e+02, 2.887325134277344e+02, 2.887804565429688e+02, 2.890135498046875e+02, 2.892208862304688e+02, 2.893665161132812e+02, 2.893272094726562e+02, 2.895038146972656e+02, 2.895655822753906e+02, 2.896374816894531e+02, 2.89692138671875e+02, 2.899512329101562e+02, 2.8978125e+02, 2.897862854003906e+02, 2.89838623046875e+02, 2.898702697753906e+02, 2.897180480957031e+02, 2.897673645019531e+02, 2.898138122558594e+02, 2.899473876953125e+02, 2.900496826171875e+02, 2.903762512207031e+02, 2.904008178710938e+02, 2.904493103027344e+02, 2.904215698242188e+02, 2.904002075195312e+02, 2.902448120117188e+02, 2.903748168945312e+02, 2.904266357421875e+02, 2.905031433105469e+02, 2.9047265625e+02, 2.907450256347656e+02, 2.906847229003906e+02, 2.907528686523438e+02, 2.907774658203125e+02, 2.906727294921875e+02, 2.900006103515625e+02, 2.898615417480469e+02, 2.897162170410156e+02, 2.897933959960938e+02, 2.897655029296875e+02, 2.901282348632812e+02, 2.902583618164062e+02, 2.903737182617188e+02, 2.902431640625e+02, 2.903079223632812e+02, 2.900013427734375e+02, 2.900890197753906e+02, 2.901162109375e+02, 2.902472534179688e+02, 2.902622680664062e+02, 2.906775817871094e+02, 2.906780090332031e+02, 2.906265869140625e+02, 2.903656005859375e+02, 2.903049926757812e+02, 2.899101867675781e+02, 2.897971801757812e+02, 2.8979052734375e+02, 2.899085998535156e+02, 2.898280944824219e+02, 2.901986389160156e+02, 2.901640014648438e+02, 2.90354736328125e+02, 2.905780334472656e+02, 2.903877563476562e+02, 2.901584777832031e+02, 2.90424072265625e+02, 2.905685119628906e+02]
ventilation.generation.weaBus.TDryBul=[2.711499938964844e+02, 2.706598205566406e+02, 2.704500122070312e+02, 2.710835876464844e+02, 2.713986511230469e+02, 2.720499877929688e+02, 2.730393371582031e+02, 2.735700073242188e+02, 2.729700012207031e+02, 2.723796081542969e+02, 2.724500122070312e+02, 2.720899963378906e+02, 2.713411865234375e+02, 2.714856872558594e+02, 2.71758056640625e+02, 2.728500061035156e+02, 2.721732788085938e+02, 2.715361633300781e+02, 2.691483459472656e+02, 2.680009765625e+02, 2.670499877929688e+02, 2.668262023925781e+02, 2.657754821777344e+02, 2.654322509765625e+02, 2.667328796386719e+02, 2.708500061035156e+02, 2.715960083007812e+02, 2.706900024414062e+02, 2.6904345703125e+02, 2.681499938964844e+02, 2.6875e+02, 2.692776794433594e+02, 2.698986511230469e+02, 2.698555908203125e+02, 2.7092041015625e+02, 2.724500122070312e+02, 2.734451904296875e+02, 2.742142639160156e+02, 2.747942810058594e+02, 2.753908081054688e+02, 2.755499877929688e+02, 2.75614013671875e+02, 2.758299865722656e+02, 2.758448791503906e+02, 2.757672424316406e+02, 2.761499938964844e+02, 2.765899963378906e+02, 2.767610473632812e+02, 2.767300109863281e+02, 2.766708068847656e+02, 2.768500061035156e+02, 2.772636108398438e+02, 2.7771533203125e+02, 2.781019897460938e+02, 2.789319152832031e+02, 2.794500122070312e+02, 2.794466247558594e+02, 2.794279174804688e+02, 2.794849243164062e+02, 2.799500122070312e+02, 2.800499877929688e+02, 2.803680114746094e+02, 2.800899963378906e+02, 2.797099914550781e+02, 2.795200500488281e+02, 2.806499938964844e+02, 2.810128784179688e+02, 2.810320129394531e+02, 2.784481201171875e+02, 2.775330505371094e+02, 2.766499938964844e+02, 2.768958740234375e+02, 2.766292114257812e+02, 2.766669616699219e+02, 2.769802551269531e+02, 2.786499938964844e+02, 2.78731689453125e+02, 2.791405029296875e+02, 2.784546508789062e+02, 2.786761779785156e+02, 2.7875e+02, 2.792179870605469e+02, 2.793362731933594e+02, 2.796307983398438e+02, 2.793832702636719e+02, 2.800499877929688e+02, 2.789285583496094e+02, 2.790899963378906e+02, 2.779700012207031e+02, 2.77250732421875e+02, 2.771499938964844e+02, 2.77614013671875e+02, 2.772754516601562e+02, 2.772228088378906e+02, 2.764660034179688e+02, 2.784500122070312e+02, 2.800023193359375e+02, 2.797099914550781e+02, 2.791930847167969e+02, 2.803331909179688e+02, 2.810499877929688e+02]
-building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.897740173339844e+02, 2.897221374511719e+02, 2.9063916015625e+02, 2.914974670410156e+02, 2.916348876953125e+02, 2.921893615722656e+02, 2.923945922851562e+02, 2.920617065429688e+02, 2.920601806640625e+02, 2.920640258789062e+02, 2.921461181640625e+02, 2.923219299316406e+02, 2.929737243652344e+02, 2.933743591308594e+02, 2.934225463867188e+02, 2.931752624511719e+02, 2.931367797851562e+02, 2.929930419921875e+02, 2.930666198730469e+02, 2.930859375e+02, 2.93161376953125e+02, 2.930523376464844e+02, 2.933205261230469e+02, 2.934375e+02, 2.932869873046875e+02, 2.932232360839844e+02, 2.931143493652344e+02, 2.929809265136719e+02, 2.930627136230469e+02, 2.930634460449219e+02, 2.931700134277344e+02, 2.931477966308594e+02, 2.934539184570312e+02, 2.932475891113281e+02, 2.931527099609375e+02, 2.931654052734375e+02, 2.931543273925781e+02, 2.929596862792969e+02, 2.930304565429688e+02, 2.930677795410156e+02, 2.93142333984375e+02, 2.931571655273438e+02, 2.9348046875e+02, 2.932884216308594e+02, 2.931956176757812e+02, 2.931513977050781e+02, 2.931472778320312e+02, 2.929644470214844e+02, 2.930401306152344e+02, 2.930520324707031e+02, 2.931173706054688e+02, 2.931325073242188e+02, 2.934468078613281e+02, 2.93271240234375e+02, 2.931995544433594e+02, 2.93166015625e+02, 2.931429748535156e+02, 2.929338989257812e+02, 2.929789428710938e+02, 2.930181579589844e+02, 2.930341796875e+02, 2.930655212402344e+02, 2.935045471191406e+02, 2.934837646484375e+02, 2.932803649902344e+02, 2.932190856933594e+02, 2.931036071777344e+02, 2.928880615234375e+02, 2.929409484863281e+02, 2.929800720214844e+02, 2.930149536132812e+02, 2.93041748046875e+02, 2.934880676269531e+02, 2.935790405273438e+02, 2.933051147460938e+02, 2.931198425292969e+02, 2.930968322753906e+02, 2.92890380859375e+02, 2.929404602050781e+02, 2.92955078125e+02, 2.930013427734375e+02, 2.929851684570312e+02, 2.934327087402344e+02, 2.935014343261719e+02, 2.932723083496094e+02, 2.932270202636719e+02, 2.9310888671875e+02, 2.928942260742188e+02, 2.929310302734375e+02, 2.929476013183594e+02, 2.929743041992188e+02, 2.929569396972656e+02, 2.934357604980469e+02, 2.935895385742188e+02, 2.9333154296875e+02, 2.932225341796875e+02, 2.930354614257812e+02, 2.928988037109375e+02, 2.92944091796875e+02, 2.929446411132812e+02]
+building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.89783935546875e+02, 2.897340393066406e+02, 2.906501770019531e+02, 2.915067138671875e+02, 2.916453552246094e+02, 2.922000732421875e+02, 2.924054260253906e+02, 2.920744018554688e+02, 2.920740051269531e+02, 2.920791931152344e+02, 2.921621704101562e+02, 2.923387145996094e+02, 2.929898681640625e+02, 2.933813781738281e+02, 2.934212341308594e+02, 2.931723022460938e+02, 2.931362609863281e+02, 2.929934997558594e+02, 2.930673828125e+02, 2.9308642578125e+02, 2.931654968261719e+02, 2.930608215332031e+02, 2.933286437988281e+02, 2.93428955078125e+02, 2.932780456542969e+02, 2.932211303710938e+02, 2.931146545410156e+02, 2.92981689453125e+02, 2.930636901855469e+02, 2.930644226074219e+02, 2.931708984375e+02, 2.93148193359375e+02, 2.934517211914062e+02, 2.93245361328125e+02, 2.931532592773438e+02, 2.931649780273438e+02, 2.931546630859375e+02, 2.929607849121094e+02, 2.930321350097656e+02, 2.930694580078125e+02, 2.931434326171875e+02, 2.9315771484375e+02, 2.934778442382812e+02, 2.932845153808594e+02, 2.931954956054688e+02, 2.9315087890625e+02, 2.931476440429688e+02, 2.929654541015625e+02, 2.930415954589844e+02, 2.930538024902344e+02, 2.93118408203125e+02, 2.9313330078125e+02, 2.9344482421875e+02, 2.932678833007812e+02, 2.931993408203125e+02, 2.931653747558594e+02, 2.931432800292969e+02, 2.929351501464844e+02, 2.929810180664062e+02, 2.930208435058594e+02, 2.930369567871094e+02, 2.930683898925781e+02, 2.935042114257812e+02, 2.934756469726562e+02, 2.932783813476562e+02, 2.932189331054688e+02, 2.930821228027344e+02, 2.928890686035156e+02, 2.929432373046875e+02, 2.929826049804688e+02, 2.930177917480469e+02, 2.93049560546875e+02, 2.934941101074219e+02, 2.935776977539062e+02, 2.933042907714844e+02, 2.931210632324219e+02, 2.93099853515625e+02, 2.92888427734375e+02, 2.9294189453125e+02, 2.929577331542969e+02, 2.930046691894531e+02, 2.929937744140625e+02, 2.934398193359375e+02, 2.935014038085938e+02, 2.932705688476562e+02, 2.93225341796875e+02, 2.931086120605469e+02, 2.928955688476562e+02, 2.929332580566406e+02, 2.9295068359375e+02, 2.929822387695312e+02, 2.929662780761719e+02, 2.934432067871094e+02, 2.935885925292969e+02, 2.933300476074219e+02, 2.932221069335938e+02, 2.930584106445312e+02, 2.92900390625e+02, 2.929465942382812e+02, 2.929480590820312e+02]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt
new file mode 100644
index 00000000..93267ee9
--- /dev/null
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt
@@ -0,0 +1,20 @@
+last-generated=2024-07-16
+statistics-initialization=
+{
+ "linear": "0",
+ "nonlinear": "5, 7, 1, 2, 1",
+ "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+ "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+ "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
+ "number of continuous time states": "104",
+ "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.218078918457031e+02, 3.383521728515625e+02, 3.101708679199219e+02, 3.153338317871094e+02, 3.205715942382812e+02, 3.250848693847656e+02, 3.282953796386719e+02, 3.223902587890625e+02, 3.231559448242188e+02, 3.230108337402344e+02, 3.232935180664062e+02, 3.239265441894531e+02, 3.237047119140625e+02, 3.303954772949219e+02, 3.237391967773438e+02, 3.242752990722656e+02, 3.239431457519531e+02, 3.309538879394531e+02, 3.246528625488281e+02, 3.245046997070312e+02, 3.316056823730469e+02, 3.246201782226562e+02, 3.2505859375e+02, 3.245976867675781e+02, 3.244599609375e+02, 3.252648620605469e+02, 3.248459777832031e+02, 3.325746765136719e+02, 3.254520874023438e+02, 3.260676879882812e+02, 3.254676208496094e+02, 3.332218017578125e+02, 3.264121398925781e+02, 3.260995178222656e+02, 3.336256408691406e+02, 3.260443420410156e+02, 3.2675634765625e+02, 3.26125e+02, 3.336301574707031e+02, 3.267723693847656e+02, 3.265009460449219e+02, 3.326959838867188e+02, 3.263403015136719e+02, 3.262664794921875e+02, 3.258694152832031e+02, 3.255455017089844e+02, 3.252900695800781e+02, 3.250927734375e+02, 3.24955322265625e+02, 3.248677368164062e+02, 3.248197021484375e+02, 3.248055419921875e+02, 3.248208618164062e+02, 3.344519653320312e+02, 3.218970947265625e+02, 3.22317626953125e+02, 3.22864013671875e+02, 3.235609436035156e+02, 3.238272399902344e+02, 3.240629272460938e+02, 3.24281494140625e+02, 3.244806518554688e+02, 3.246611022949219e+02, 3.248232116699219e+02, 3.249683837890625e+02, 3.250578308105469e+02, 3.251077575683594e+02, 3.251576232910156e+02, 3.252128601074219e+02, 3.252694091796875e+02, 3.253160705566406e+02, 3.253486328125e+02, 3.253663940429688e+02, 3.253663024902344e+02, 3.253450317382812e+02, 3.252928771972656e+02, 3.252086791992188e+02, 3.251070251464844e+02, 3.250069580078125e+02, 3.249223022460938e+02, 3.248528747558594e+02, 3.24805419921875e+02, 3.247897644042969e+02, 3.248209533691406e+02, 3.249095153808594e+02, 3.250364990234375e+02, 3.251686401367188e+02, 3.2522900390625e+02, 3.252888488769531e+02, 3.253368225097656e+02, 3.371232604980469e+02, 3.223807373046875e+02, 3.227559509277344e+02, 3.231121215820312e+02, 3.234132995605469e+02, 3.236752319335938e+02, 3.239076232910156e+02, 3.241154174804688e+02, 3.243020324707031e+02, 3.244696350097656e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.856601257324219e+02, 2.854604187011719e+02, 2.856351013183594e+02, 2.863979187011719e+02, 2.871377868652344e+02, 2.878543701171875e+02, 2.885304565429688e+02, 2.890649719238281e+02, 2.89106689453125e+02, 2.890479431152344e+02, 2.891405944824219e+02, 2.89201904296875e+02, 2.891220703125e+02, 2.890444641113281e+02, 2.891540222167969e+02, 2.892165222167969e+02, 2.89139892578125e+02, 2.891227111816406e+02, 2.893418273925781e+02, 2.892816772460938e+02, 2.891984252929688e+02, 2.893982238769531e+02, 2.894529418945312e+02, 2.893691101074219e+02, 2.89406494140625e+02, 2.896642456054688e+02, 2.896808471679688e+02, 2.89719970703125e+02, 2.901651306152344e+02, 2.903453674316406e+02, 2.903014526367188e+02, 2.903853759765625e+02, 2.907554626464844e+02, 2.907449035644531e+02, 2.90684326171875e+02, 2.909793090820312e+02, 2.911857299804688e+02, 2.911407775878906e+02, 2.911770629882812e+02, 2.9149365234375e+02, 2.915191955566406e+02, 2.915339660644531e+02, 2.917582092285156e+02, 2.918026733398438e+02, 2.9175732421875e+02, 2.916903076171875e+02, 2.915896911621094e+02, 2.9152001953125e+02, 2.914995422363281e+02, 2.914923706054688e+02, 2.914707946777344e+02, 2.914532165527344e+02, 2.914386596679688e+02, 2.914116821289062e+02, 2.91275390625e+02, 2.911984252929688e+02, 2.912759399414062e+02, 2.913936767578125e+02, 2.914764404296875e+02, 2.915777282714844e+02, 2.916781921386719e+02, 2.917742614746094e+02, 2.918511047363281e+02, 2.919002075195312e+02, 2.919453735351562e+02, 2.91986572265625e+02, 2.920153503417969e+02, 2.92015380859375e+02, 2.92013427734375e+02, 2.92012451171875e+02, 2.920115051269531e+02, 2.9200048828125e+02, 2.919874877929688e+02, 2.9197412109375e+02, 2.919602355957031e+02, 2.919224853515625e+02, 2.918743896484375e+02, 2.918216857910156e+02, 2.917637329101562e+02, 2.917415466308594e+02, 2.917455444335938e+02, 2.917501525878906e+02, 2.917550964355469e+02, 2.917551879882812e+02, 2.917495422363281e+02, 2.917484741210938e+02, 2.917540283203125e+02, 2.917601928710938e+02, 2.917533264160156e+02, 2.917442321777344e+02, 2.91710205078125e+02, 2.914966735839844e+02, 2.913819274902344e+02, 2.9136279296875e+02, 2.913882141113281e+02, 2.914312744140625e+02, 2.914712524414062e+02, 2.915104064941406e+02, 2.915477600097656e+02, 2.915824279785156e+02]
+electricalGrid.PElecGen=[0e+00, 0e+00]
+electricalGrid.PElecLoa=[4.08774462890625e+03, 5.1363642578125e+03, 5.87075830078125e+03, 2.2601708984375e+04, 2.2598794921875e+04, 2.25936640625e+04, 2.2856330078125e+04, 2.2031212890625e+04, 5.13381298828125e+03, 5.166583984375e+03, 5.15257666015625e+03, 5.161544921875e+03, 5.18826416015625e+03, 5.1693271484375e+03, 2.0476044921875e+04, 5.1504169921875e+03, 5.16638720703125e+03, 5.13794873046875e+03, 2.061741796875e+04, 5.15611669921875e+03, 5.138357421875e+03, 2.0780330078125e+04, 5.13158740234375e+03, 5.15075146484375e+03, 5.1284912109375e+03, 5.11703271484375e+03, 5.1400146484375e+03, 5.102775390625e+03, 2.11961484375e+04, 5.09614013671875e+03, 5.11421630859375e+03, 5.0841748046875e+03, 2.105328515625e+04, 5.11049462890625e+03, 5.091517578125e+03, 2.11520234375e+04, 5.07796142578125e+03, 5.0994931640625e+03, 5.0715263671875e+03, 2.0926931640625e+04, 5.14258447265625e+03, 5.15970654296875e+03, 2.0272892578125e+04, 5.18645263671875e+03, 5.19551123046875e+03, 5.1934521484375e+03, 5.2001162109375e+03, 5.2132275390625e+03, 5.22950927734375e+03, 5.246103515625e+03, 5.2637236328125e+03, 5.282470703125e+03, 5.30252880859375e+03, 5.32354638671875e+03, 5.8001865234375e+03, 5.1985166015625e+03, 5.233501953125e+03, 5.27283740234375e+03, 5.31823828125e+03, 5.33762744140625e+03, 5.3544404296875e+03, 5.36945556640625e+03, 5.382509765625e+03, 5.393734375e+03, 5.4037568359375e+03, 5.41253369140625e+03, 5.356919921875e+03, 5.27594970703125e+03, 5.24787255859375e+03, 5.263072265625e+03, 5.2930078125e+03, 5.30823779296875e+03, 5.3036083984375e+03, 5.2838173828125e+03, 5.2458955078125e+03, 5.18759912109375e+03, 5.0985107421875e+03, 4.98798583984375e+03, 4.883953125e+03, 4.8130556640625e+03, 4.78018310546875e+03, 4.762076171875e+03, 4.7684296875e+03, 4.811115234375e+03, 4.90886669921875e+03, 5.07379443359375e+03, 5.26365771484375e+03, 5.41475048828125e+03, 5.41464892578125e+03, 5.41494189453125e+03, 5.41491015625e+03, 5.95443310546875e+03, 5.24428955078125e+03, 5.26423779296875e+03, 5.28369873046875e+03, 5.30068505859375e+03, 5.31602099609375e+03, 5.33030712890625e+03, 5.3435673828125e+03, 5.3556796875e+03, 5.36644970703125e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt
new file mode 100644
index 00000000..d41a82bf
--- /dev/null
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt
@@ -0,0 +1,20 @@
+last-generated=2024-07-16
+statistics-initialization=
+{
+ "linear": "0",
+ "nonlinear": "5, 7, 1, 2, 1",
+ "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+ "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+ "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
+ "number of continuous time states": "104",
+ "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.292882385253906e+02, 3.100580139160156e+02, 3.121235961914062e+02, 3.128670043945312e+02, 3.129295043945312e+02, 3.128672790527344e+02, 3.12814453125e+02, 3.128034362792969e+02, 3.128304138183594e+02, 3.128834228515625e+02, 3.129519653320312e+02, 3.130289306640625e+02, 3.131151733398438e+02, 3.132344055175781e+02, 3.133772888183594e+02, 3.135265808105469e+02, 3.136636352539062e+02, 3.137904663085938e+02, 3.139110717773438e+02, 3.140266418457031e+02, 3.141370849609375e+02, 3.14198974609375e+02, 3.1421435546875e+02, 3.142234497070312e+02, 3.142720031738281e+02, 3.144117431640625e+02, 3.146255798339844e+02, 3.148503112792969e+02, 3.150163879394531e+02, 3.151029968261719e+02, 3.151755065917969e+02, 3.152431335449219e+02, 3.153095397949219e+02, 3.153759155273438e+02, 3.154421997070312e+02, 3.15509033203125e+02, 3.1557666015625e+02, 3.156148071289062e+02, 3.154659423828125e+02, 3.151794128417969e+02, 3.1485986328125e+02, 3.146211853027344e+02, 3.144536743164062e+02, 3.27049560546875e+02, 3.143635864257812e+02, 3.141488952636719e+02, 3.138703002929688e+02, 3.135124206542969e+02, 3.131512756347656e+02, 3.128770141601562e+02, 3.127528686523438e+02, 3.126805114746094e+02, 3.126532592773438e+02, 3.126591186523438e+02, 3.126943054199219e+02, 3.127553405761719e+02, 3.128274841308594e+02, 3.129045104980469e+02, 3.129801330566406e+02, 3.13056884765625e+02, 3.131316528320312e+02, 3.132025451660156e+02, 3.132669982910156e+02, 3.133210754394531e+02, 3.133666381835938e+02, 3.13404296875e+02, 3.134328918457031e+02, 3.134462890625e+02, 3.134480285644531e+02, 3.134424438476562e+02, 3.134336547851562e+02, 3.134223022460938e+02, 3.134092712402344e+02, 3.133973999023438e+02, 3.133886413574219e+02, 3.133831481933594e+02, 3.133791198730469e+02, 3.133768920898438e+02, 3.133731994628906e+02, 3.133695678710938e+02, 3.133758544921875e+02, 3.133835144042969e+02, 3.133884887695312e+02, 3.133852233886719e+02, 3.133671875e+02, 3.13337890625e+02, 3.133027954101562e+02, 3.132684020996094e+02, 3.132299194335938e+02, 3.267185974121094e+02, 3.117964782714844e+02, 3.115359802246094e+02, 3.116806640625e+02, 3.119337768554688e+02, 3.121224975585938e+02, 3.122770690917969e+02, 3.124056396484375e+02, 3.125132141113281e+02, 3.126038208007812e+02, 3.126795959472656e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.890777587890625e+02, 2.889273376464844e+02, 2.894195556640625e+02, 2.899176940917969e+02, 2.901485595703125e+02, 2.902310485839844e+02, 2.90242919921875e+02, 2.9022607421875e+02, 2.901995544433594e+02, 2.901708984375e+02, 2.901427001953125e+02, 2.901153869628906e+02, 2.9008837890625e+02, 2.900563354492188e+02, 2.900397644042969e+02, 2.900413818359375e+02, 2.900479736328125e+02, 2.900582885742188e+02, 2.900702514648438e+02, 2.900836486816406e+02, 2.90098388671875e+02, 2.901208190917969e+02, 2.901517333984375e+02, 2.901819763183594e+02, 2.902044982910156e+02, 2.903195190429688e+02, 2.904656982421875e+02, 2.906232604980469e+02, 2.907998657226562e+02, 2.909551391601562e+02, 2.910844116210938e+02, 2.912130126953125e+02, 2.913432006835938e+02, 2.914639587402344e+02, 2.915712890625e+02, 2.916823425292969e+02, 2.918126525878906e+02, 2.919489135742188e+02, 2.920653686523438e+02, 2.921797485351562e+02, 2.923128356933594e+02, 2.924430847167969e+02, 2.925577087402344e+02, 2.926496276855469e+02, 2.92620849609375e+02, 2.926365966796875e+02, 2.926372375488281e+02, 2.926165466308594e+02, 2.926128234863281e+02, 2.926043090820312e+02, 2.925697937011719e+02, 2.92537109375e+02, 2.925070190429688e+02, 2.924736328125e+02, 2.925052490234375e+02, 2.925741882324219e+02, 2.926430358886719e+02, 2.927095947265625e+02, 2.927791748046875e+02, 2.928550415039062e+02, 2.929288330078125e+02, 2.929994201660156e+02, 2.930511779785156e+02, 2.930713500976562e+02, 2.930886535644531e+02, 2.931038513183594e+02, 2.93110107421875e+02, 2.930885009765625e+02, 2.930667114257812e+02, 2.930464782714844e+02, 2.930263977050781e+02, 2.929955749511719e+02, 2.929635925292969e+02, 2.929328918457031e+02, 2.929042358398438e+02, 2.92853515625e+02, 2.927947387695312e+02, 2.927347412109375e+02, 2.926726379394531e+02, 2.926509704589844e+02, 2.926601867675781e+02, 2.926705017089844e+02, 2.926800537109375e+02, 2.926815795898438e+02, 2.926714172363281e+02, 2.926581420898438e+02, 2.926437683105469e+02, 2.926243286132812e+02, 2.925902404785156e+02, 2.925555725097656e+02, 2.924181213378906e+02, 2.923406066894531e+02, 2.923440856933594e+02, 2.923552551269531e+02, 2.923783264160156e+02, 2.924032592773438e+02, 2.924181823730469e+02, 2.924299621582031e+02, 2.924398803710938e+02, 2.924478454589844e+02]
+electricalGrid.PElecGen=[0e+00, 0e+00]
+electricalGrid.PElecLoa=[4.089443359375e+03, 5.0148115234375e+03, 4.4793017578125e+03, 3.191553955078125e+03, 1.969959838867188e+03, 1.604573852539062e+03, 1.47270263671875e+03, 1.422350708007812e+03, 1.4107783203125e+03, 1.415317138671875e+03, 1.425337646484375e+03, 1.436604248046875e+03, 1.44772802734375e+03, 1.459516845703125e+03, 1.476947631835938e+03, 1.496950927734375e+03, 1.515118530273438e+03, 1.529225219726562e+03, 1.5411728515625e+03, 1.552495971679688e+03, 1.56342626953125e+03, 1.573800415039062e+03, 1.574984619140625e+03, 1.569230224609375e+03, 1.565911865234375e+03, 1.572868896484375e+03, 1.595424926757812e+03, 1.629892333984375e+03, 1.660295776367188e+03, 1.670651977539062e+03, 1.662784790039062e+03, 1.658776977539062e+03, 1.658415405273438e+03, 1.659959838867188e+03, 1.662509155273438e+03, 1.6661455078125e+03, 1.670057861328125e+03, 1.67339453125e+03, 1.667407836914062e+03, 1.616405151367188e+03, 1.560165405273438e+03, 1.510168212890625e+03, 1.483540405273438e+03, 1.469709594726562e+03, 4.79357763671875e+03, 1.855734497070312e+03, 1.659578369140625e+03, 1.475222534179688e+03, 1.369492797851562e+03, 1.306884643554688e+03, 1.278709228515625e+03, 1.27751708984375e+03, 1.277439086914062e+03, 1.278318725585938e+03, 1.279882080078125e+03, 1.281982055664062e+03, 1.284439086914062e+03, 1.286846557617188e+03, 1.288915649414062e+03, 1.290931396484375e+03, 1.2929765625e+03, 1.294969360351562e+03, 1.296857055664062e+03, 1.29856982421875e+03, 1.300008911132812e+03, 1.30122265625e+03, 1.30221875e+03, 1.302956787109375e+03, 1.303262084960938e+03, 1.303244750976562e+03, 1.3030341796875e+03, 1.302759033203125e+03, 1.302432495117188e+03, 1.302078369140625e+03, 1.301773803710938e+03, 1.301572631835938e+03, 1.301485107421875e+03, 1.30145849609375e+03, 1.3014794921875e+03, 1.301442260742188e+03, 1.301394653320312e+03, 1.301600219726562e+03, 1.301825317382812e+03, 1.301952270507812e+03, 1.301817749023438e+03, 1.301243530273438e+03, 1.300351806640625e+03, 1.299321411132812e+03, 1.298347290039062e+03, 1.297275146484375e+03, 4.8923955078125e+03, 1.426876831054688e+03, 1.320454833984375e+03, 1.258430297851562e+03, 1.264501220703125e+03, 1.269128173828125e+03, 1.272972900390625e+03, 1.27617626953125e+03, 1.278880126953125e+03, 1.281174560546875e+03, 1.283102905273438e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt
new file mode 100644
index 00000000..2ab0fddd
--- /dev/null
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt
@@ -0,0 +1,20 @@
+last-generated=2024-07-16
+statistics-initialization=
+{
+ "linear": "0",
+ "nonlinear": "5, 7, 1, 2, 1",
+ "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+ "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+ "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
+ "number of continuous time states": "104",
+ "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02]
+hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.051783752441406e+02, 3.1141650390625e+02, 3.322492065429688e+02, 3.057630004882812e+02, 3.091819763183594e+02, 3.125884094238281e+02, 3.083719482421875e+02, 3.088800659179688e+02, 3.090914001464844e+02, 3.092567138671875e+02, 3.093793334960938e+02, 3.0946826171875e+02, 3.095280151367188e+02, 3.0955615234375e+02, 3.09557861328125e+02, 3.095443725585938e+02, 3.095195617675781e+02, 3.094862365722656e+02, 3.094458923339844e+02, 3.094002990722656e+02, 3.093509216308594e+02, 3.093099975585938e+02, 3.092815551757812e+02, 3.092587890625e+02, 3.092303161621094e+02, 3.091927185058594e+02, 3.153045349121094e+02, 3.100467224121094e+02, 3.099926147460938e+02, 3.098340759277344e+02, 3.097118225097656e+02, 3.100785522460938e+02, 3.105133972167969e+02, 3.10285400390625e+02, 3.101077575683594e+02, 3.099695434570312e+02, 3.104660949707031e+02, 3.107707824707031e+02, 3.105863647460938e+02, 3.10501953125e+02, 3.104906311035156e+02, 3.105179138183594e+02, 3.105704956054688e+02, 3.106415100097656e+02, 3.107252197265625e+02, 3.108208923339844e+02, 3.109225158691406e+02, 3.110308837890625e+02, 3.206625671386719e+02, 3.26447021484375e+02, 3.125987854003906e+02, 3.074232177734375e+02, 3.091536560058594e+02, 3.097052001953125e+02, 3.102033386230469e+02, 3.106448059082031e+02, 3.110077819824219e+02, 3.110921630859375e+02, 3.1109619140625e+02, 3.110484313964844e+02, 3.109870910644531e+02, 3.109302673339844e+02, 3.108862609863281e+02, 3.108521728515625e+02, 3.108298950195312e+02, 3.108203430175781e+02, 3.108241271972656e+02, 3.108424682617188e+02, 3.108731689453125e+02, 3.10909423828125e+02, 3.109416809082031e+02, 3.109652404785156e+02, 3.109792785644531e+02, 3.109824523925781e+02, 3.109732055664062e+02, 3.109454650878906e+02, 3.108987121582031e+02, 3.108421325683594e+02, 3.107861938476562e+02, 3.107398376464844e+02, 3.107045593261719e+02, 3.106806030273438e+02, 3.10673095703125e+02, 3.106900939941406e+02, 3.107373962402344e+02, 3.10805908203125e+02, 3.10879638671875e+02, 3.109414672851562e+02, 3.1099462890625e+02, 3.103296813964844e+02, 3.191802368164062e+02, 3.334124450683594e+02, 3.339319152832031e+02, 3.067274475097656e+02, 3.084962158203125e+02, 3.091851806640625e+02, 3.097752685546875e+02, 3.102646179199219e+02, 3.106735534667969e+02, 3.109930419921875e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.890777587890625e+02, 2.889215698242188e+02, 2.888302001953125e+02, 2.887602844238281e+02, 2.891433715820312e+02, 2.89571533203125e+02, 2.898331298828125e+02, 2.898074035644531e+02, 2.897869873046875e+02, 2.897696838378906e+02, 2.897503051757812e+02, 2.897277526855469e+02, 2.897015380859375e+02, 2.896665649414062e+02, 2.896420593261719e+02, 2.896307983398438e+02, 2.896212158203125e+02, 2.896137390136719e+02, 2.89607177734375e+02, 2.896015625e+02, 2.89596923828125e+02, 2.896000061035156e+02, 2.896139221191406e+02, 2.896310424804688e+02, 2.89642822265625e+02, 2.897447204589844e+02, 2.898793334960938e+02, 2.901560668945312e+02, 2.902806396484375e+02, 2.903843383789062e+02, 2.904742126464844e+02, 2.906776123046875e+02, 2.908188781738281e+02, 2.908861694335938e+02, 2.90951416015625e+02, 2.910265502929688e+02, 2.912522583007812e+02, 2.913822021484375e+02, 2.914481811523438e+02, 2.9153515625e+02, 2.916626892089844e+02, 2.918027954101562e+02, 2.919335632324219e+02, 2.920425720214844e+02, 2.921098022460938e+02, 2.921373596191406e+02, 2.921105651855469e+02, 2.920975036621094e+02, 2.920775451660156e+02, 2.918528137207031e+02, 2.916018676757812e+02, 2.917192687988281e+02, 2.918398742675781e+02, 2.918492736816406e+02, 2.919285278320312e+02, 2.920403747558594e+02, 2.921466979980469e+02, 2.922429504394531e+02, 2.923272705078125e+02, 2.924048461914062e+02, 2.924718933105469e+02, 2.925311279296875e+02, 2.9256982421875e+02, 2.925782470703125e+02, 2.925847473144531e+02, 2.925906372070312e+02, 2.925891723632812e+02, 2.925634460449219e+02, 2.925397033691406e+02, 2.925198974609375e+02, 2.925019226074219e+02, 2.924740905761719e+02, 2.924451904296875e+02, 2.924171447753906e+02, 2.923901062011719e+02, 2.923392944335938e+02, 2.922782897949219e+02, 2.922141723632812e+02, 2.921465759277344e+02, 2.921187438964844e+02, 2.921219787597656e+02, 2.921264343261719e+02, 2.921306762695312e+02, 2.921280822753906e+02, 2.921160278320312e+02, 2.921040954589844e+02, 2.920943603515625e+02, 2.920819702148438e+02, 2.920565185546875e+02, 2.920305786132812e+02, 2.919456481933594e+02, 2.916667785644531e+02, 2.914321594238281e+02, 2.914626770019531e+02, 2.916319580078125e+02, 2.916949157714844e+02, 2.917546691894531e+02, 2.918092651367188e+02, 2.918573303222656e+02, 2.918984375e+02]
+electricalGrid.PElecGen=[0e+00, 0e+00]
+electricalGrid.PElecLoa=[1.257892211914062e+03, 1.379450317382812e+03, 1.420164184570312e+03, 7.21313916015625e+03, 6.94710791015625e+03, 6.94553076171875e+03, 6.60204736328125e+03, 1.374174438476562e+03, 1.37256591796875e+03, 1.370952026367188e+03, 1.370822265625e+03, 1.371592651367188e+03, 1.37177392578125e+03, 1.37134375e+03, 1.369788330078125e+03, 1.367399169921875e+03, 1.36468896484375e+03, 1.362030883789062e+03, 1.359385864257812e+03, 1.35669921875e+03, 1.353990234375e+03, 1.35129736328125e+03, 1.3497021484375e+03, 1.34912255859375e+03, 1.348619750976562e+03, 1.347177734375e+03, 1.34386767578125e+03, 6.27789599609375e+03, 1.350348022460938e+03, 1.346679443359375e+03, 1.342874389648438e+03, 1.339713623046875e+03, 1.344868041992188e+03, 1.350573608398438e+03, 1.345585083007812e+03, 1.341468627929688e+03, 1.338017822265625e+03, 1.345273803710938e+03, 1.349462768554688e+03, 1.3496787109375e+03, 1.353852294921875e+03, 1.359318725585938e+03, 1.363650146484375e+03, 1.367276611328125e+03, 1.371003784179688e+03, 1.375442016601562e+03, 1.381245849609375e+03, 1.387914794921875e+03, 1.394899658203125e+03, 1.568239990234375e+03, 1.663784301757812e+03, 6.25141357421875e+03, 1.382460693359375e+03, 1.387467163085938e+03, 1.397526733398438e+03, 1.410134887695312e+03, 1.421126342773438e+03, 1.417771484375e+03, 1.306460815429688e+03, 1.217305908203125e+03, 1.155354736328125e+03, 1.1146923828125e+03, 1.09064697265625e+03, 1.078691284179688e+03, 1.074025024414062e+03, 1.07378125e+03, 1.076690551757812e+03, 1.08288330078125e+03, 1.094314086914063e+03, 1.108347534179687e+03, 1.121223388671875e+03, 1.129649780273438e+03, 1.133896362304688e+03, 1.135190795898438e+03, 1.133255126953125e+03, 1.127922973632812e+03, 1.118292724609375e+03, 1.105959838867188e+03, 1.094154052734375e+03, 1.086633666992188e+03, 1.083659423828125e+03, 1.080582275390625e+03, 1.0801689453125e+03, 1.084615112304688e+03, 1.096986938476562e+03, 1.119366333007812e+03, 1.145689575195312e+03, 1.168489379882812e+03, 1.18188232421875e+03, 1.191984130859375e+03, 1.41423828125e+03, 1.588885864257812e+03, 7.26249560546875e+03, 1.810666259765625e+03, 1.401784423828125e+03, 1.401857055664062e+03, 1.402028442382812e+03, 1.406873657226562e+03, 1.416212036132812e+03, 1.42418408203125e+03, 1.41866162109375e+03]
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt
index 8699b8fb..843b03f3 100644
--- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt
+++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-28
+last-generated=2024-07-16
statistics-initialization=
{
"linear": "7"
@@ -12,6 +12,6 @@ statistics-simulation=
}
time=[0e+00, 1.728e+05]
weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714423522949219e+02, 2.713688049316406e+02, 2.711300048828125e+02, 2.708900146484375e+02, 2.706499938964844e+02, 2.704100036621094e+02, 2.701031188964844e+02, 2.696802062988281e+02, 2.693132629394531e+02, 2.689815979003906e+02, 2.687498474121094e+02, 2.687302856445312e+02, 2.684281311035156e+02, 2.677860412597656e+02, 2.674700012207031e+02, 2.672780151367188e+02, 2.670859985351562e+02, 2.668940124511719e+02, 2.667543640136719e+02, 2.674586791992188e+02, 2.682342834472656e+02, 2.686448669433594e+02, 2.692129211425781e+02, 2.700237121582031e+02, 2.708500061035156e+02, 2.716349792480469e+02, 2.723893127441406e+02, 2.729895324707031e+02, 2.733184814453125e+02, 2.734673461914062e+02, 2.735424194335938e+02, 2.735648498535156e+02, 2.73562255859375e+02, 2.734952392578125e+02, 2.733829650878906e+02, 2.733241271972656e+02, 2.733239440917969e+02, 2.734044799804688e+02, 2.735684204101562e+02, 2.736940002441406e+02, 2.737637023925781e+02, 2.737111511230469e+02, 2.734936828613281e+02, 2.733190002441406e+02, 2.73205322265625e+02, 2.731450805664062e+02, 2.731335754394531e+02, 2.7315283203125e+02, 2.732023315429688e+02, 2.7325e+02, 2.732466735839844e+02, 2.732464294433594e+02, 2.733169860839844e+02, 2.734288940429688e+02, 2.735700073242188e+02, 2.737182312011719e+02, 2.738376770019531e+02, 2.739303588867188e+02, 2.739819946289062e+02, 2.740299987792969e+02, 2.740780029296875e+02, 2.741260070800781e+02, 2.741852416992188e+02, 2.742919921875e+02, 2.743815307617188e+02, 2.744320983886719e+02, 2.744386291503906e+02, 2.742976684570312e+02, 2.742652587890625e+02, 2.743667907714844e+02, 2.744607849121094e+02, 2.74489013671875e+02, 2.745615539550781e+02, 2.748076477050781e+02, 2.751499938964844e+02, 2.755416259765625e+02, 2.759237670898438e+02, 2.761777038574219e+02, 2.763310241699219e+02, 2.764301147460938e+02, 2.764605407714844e+02, 2.7639404296875e+02, 2.762903747558594e+02, 2.7616455078125e+02, 2.760198059082031e+02, 2.758236999511719e+02, 2.755619812011719e+02, 2.753553771972656e+02, 2.751993103027344e+02, 2.751300048828125e+02, 2.750820007324219e+02, 2.750339965820312e+02, 2.749859924316406e+02, 2.749522399902344e+02, 2.751499938964844e+02, 2.753774108886719e+02, 2.755320129394531e+02, 2.756587219238281e+02, 2.756750183105469e+02, 2.755499877929688e+02]
-outputs.building.TZone[1]=[2.931499938964844e+02, 2.931821594238281e+02, 2.931440124511719e+02, 2.931449584960938e+02, 2.93144775390625e+02, 2.931447143554688e+02, 2.931446533203125e+02, 2.93141845703125e+02, 2.931540832519531e+02, 2.931559143066406e+02, 2.931568298339844e+02, 2.931609191894531e+02, 2.931628723144531e+02, 2.932030334472656e+02, 2.932010192871094e+02, 2.931893615722656e+02, 2.931892395019531e+02, 2.931822814941406e+02, 2.931827392578125e+02, 2.931803283691406e+02, 2.931814270019531e+02, 2.931876831054688e+02, 2.931740417480469e+02, 2.93153076171875e+02, 2.931479187011719e+02, 2.931508178710938e+02, 2.931431884765625e+02, 2.931416320800781e+02, 2.931690063476562e+02, 2.931655578613281e+02, 2.9316748046875e+02, 2.931649780273438e+02, 2.931495056152344e+02, 2.93149658203125e+02, 2.931390991210938e+02, 2.931411743164062e+02, 2.931378173828125e+02, 2.931392211914062e+02, 2.931310729980469e+02, 2.931312561035156e+02, 2.931519165039062e+02, 2.931514282226562e+02, 2.931466064453125e+02, 2.931451110839844e+02, 2.931411743164062e+02, 2.931396484375e+02, 2.918351135253906e+02, 2.909276428222656e+02, 2.908532104492188e+02, 2.907676696777344e+02, 2.906834411621094e+02, 2.906234741210938e+02, 2.905701293945312e+02, 2.905232849121094e+02, 2.904812927246094e+02, 2.904426574707031e+02, 2.904060668945312e+02, 2.903684692382812e+02, 2.903297424316406e+02, 2.902886657714844e+02, 2.902473754882812e+02, 2.902066345214844e+02, 2.901664428710938e+02, 2.934631042480469e+02, 2.931927185058594e+02, 2.931685791015625e+02, 2.931671447753906e+02, 2.931585388183594e+02, 2.93159423828125e+02, 2.931661376953125e+02, 2.931632385253906e+02, 2.931625366210938e+02, 2.9315869140625e+02, 2.931488647460938e+02, 2.93150390625e+02, 2.93152099609375e+02, 2.931493530273438e+02, 2.931492919921875e+02, 2.931531677246094e+02, 2.931538391113281e+02, 2.9315771484375e+02, 2.931553649902344e+02, 2.931505126953125e+02, 2.931507873535156e+02, 2.931510009765625e+02, 2.931512756347656e+02, 2.93146484375e+02, 2.931466064453125e+02, 2.931280212402344e+02, 2.931287536621094e+02, 2.931506652832031e+02, 2.931504821777344e+02, 2.931468811035156e+02, 2.931464233398438e+02, 2.931468200683594e+02, 2.931485900878906e+02, 2.921778869628906e+02, 2.914781188964844e+02, 2.914222412109375e+02, 2.913445129394531e+02, 2.912581481933594e+02]
+outputs.building.TZone[1]=[2.931499938964844e+02, 2.925873413085938e+02, 2.925449829101562e+02, 2.924801940917969e+02, 2.9241796875e+02, 2.923544616699219e+02, 2.922896728515625e+02, 2.922155151367188e+02, 2.921928100585938e+02, 2.922099304199219e+02, 2.922401428222656e+02, 2.922874450683594e+02, 2.923772888183594e+02, 2.925747680664062e+02, 2.929948120117188e+02, 2.931925048828125e+02, 2.931903991699219e+02, 2.931831359863281e+02, 2.931834411621094e+02, 2.931811218261719e+02, 2.931822509765625e+02, 2.931884460449219e+02, 2.931747741699219e+02, 2.931537780761719e+02, 2.931488952636719e+02, 2.931517639160156e+02, 2.931441040039062e+02, 2.931425170898438e+02, 2.931693115234375e+02, 2.931658325195312e+02, 2.93167724609375e+02, 2.931651916503906e+02, 2.931499938964844e+02, 2.931501159667969e+02, 2.931398315429688e+02, 2.931418762207031e+02, 2.931385192871094e+02, 2.93139892578125e+02, 2.931314392089844e+02, 2.931316223144531e+02, 2.931522827148438e+02, 2.931517944335938e+02, 2.931469116210938e+02, 2.931454162597656e+02, 2.931416625976562e+02, 2.931402282714844e+02, 2.918187866210938e+02, 2.909020385742188e+02, 2.908292846679688e+02, 2.907455749511719e+02, 2.906632080078125e+02, 2.906051330566406e+02, 2.905536499023438e+02, 2.905086975097656e+02, 2.904685363769531e+02, 2.904317321777344e+02, 2.9039697265625e+02, 2.903612060546875e+02, 2.903243103027344e+02, 2.902850036621094e+02, 2.902455139160156e+02, 2.9020654296875e+02, 2.901681518554688e+02, 2.934621276855469e+02, 2.931925354003906e+02, 2.931684265136719e+02, 2.931669616699219e+02, 2.931583557128906e+02, 2.931591491699219e+02, 2.931661376953125e+02, 2.93163330078125e+02, 2.9316259765625e+02, 2.931587524414062e+02, 2.931489868164062e+02, 2.931507568359375e+02, 2.931524658203125e+02, 2.931497192382812e+02, 2.93149658203125e+02, 2.931529846191406e+02, 2.931536254882812e+02, 2.931575012207031e+02, 2.931551208496094e+02, 2.931505737304688e+02, 2.931508178710938e+02, 2.931513366699219e+02, 2.93151611328125e+02, 2.931468200683594e+02, 2.931469421386719e+02, 2.931280822753906e+02, 2.931288146972656e+02, 2.931506958007812e+02, 2.931505432128906e+02, 2.931469116210938e+02, 2.93146484375e+02, 2.931470642089844e+02, 2.9314892578125e+02, 2.921931457519531e+02, 2.91506103515625e+02, 2.914521179199219e+02, 2.913761291503906e+02, 2.912914428710938e+02]
electricalGrid.PElecGen=[0e+00, 0e+00]
-electricalGrid.PElecLoa=[0e+00, 7.94113916015625e+03, 8.01014892578125e+03, 8.08948681640625e+03, 8.1639423828125e+03, 8.2398046875e+03, 8.316478515625e+03, 8.4085107421875e+03, 8.3975048828125e+03, 8.3224951171875e+03, 8.2297421875e+03, 8.11173828125e+03, 7.92496826171875e+03, 7.54983056640625e+03, 6.823652343749998e+03, 6.09450439453125e+03, 5.5368486328125e+03, 4.992851074218749e+03, 4.5405634765625e+03, 4.015431640625e+03, 3.59484130859375e+03, 3.0435498046875e+03, 2.6047529296875e+03, 2.445219970703125e+03, 2.579023681640625e+03, 2.5474970703125e+03, 2.640173583984375e+03, 2.7625576171875e+03, 2.545524414062499e+03, 2.301639404296875e+03, 2.054718017578125e+03, 1.82189990234375e+03, 1.751370483398438e+03, 1.750782592773438e+03, 1.845105224609376e+03, 1.98095849609375e+03, 2.1270498046875e+03, 2.289830322265625e+03, 2.482501708984375e+03, 2.750784912109375e+03, 2.940921142578125e+03, 2.910523681640625e+03, 2.909634765625e+03, 2.977997314453125e+03, 3.054855712890625e+03, 3.21123876953125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.6864345703125e+03, 3.75241943359375e+03, 3.25103857421875e+03, 3.001033935546875e+03, 2.788374267578125e+03, 2.679852294921874e+03, 2.464555664062502e+03, 2.239625244140627e+03, 2.050875244140625e+03, 1.898574340820312e+03, 1.8789228515625e+03, 1.921133911132812e+03, 1.90447509765625e+03, 1.915225952148438e+03, 1.922805541992188e+03, 1.883202270507812e+03, 1.835259399414062e+03, 1.73676953125e+03, 1.647532470703125e+03, 1.614908081054688e+03, 1.603034545898438e+03, 1.591032470703125e+03, 1.573591064453125e+03, 1.585214965820312e+03, 1.634187744140625e+03, 1.77666552734375e+03, 2.083842529296875e+03, 2.300395263671875e+03, 2.287618896484375e+03, 2.291545654296875e+03, 2.344634033203125e+03, 2.39546826171875e+03, 2.42413330078125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+electricalGrid.PElecLoa=[0e+00, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.94654443359375e+03, 6.41422412109375e+03, 5.840228515625e+03, 5.282344726562499e+03, 4.81900146484375e+03, 4.2840654296875e+03, 3.851095947265625e+03, 3.288197509765625e+03, 2.83845556640625e+03, 2.66829150390625e+03, 2.78822216796875e+03, 2.742919677734375e+03, 2.822203857421875e+03, 2.93145166015625e+03, 2.708189697265624e+03, 2.4601123046875e+03, 2.209489013671875e+03, 1.973409423828125e+03, 1.897411254882812e+03, 1.89021044921875e+03, 1.975911132812501e+03, 2.101527099609375e+03, 2.237510009765625e+03, 2.39034375e+03, 2.574744384765625e+03, 2.837539306640625e+03, 3.022433349609375e+03, 2.987010009765625e+03, 2.981299560546875e+03, 3.04504541015625e+03, 3.116999267578125e+03, 3.264956298828125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.687759765625e+03, 3.75555908203125e+03, 3.256296875e+03, 3.00856591796875e+03, 2.798378173828125e+03, 2.692573730468749e+03, 2.479452880859377e+03, 2.253245361328127e+03, 2.0633037109375e+03, 1.90984423828125e+03, 1.88900439453125e+03, 1.926214965820312e+03, 1.904290405273438e+03, 1.90972412109375e+03, 1.91193701171875e+03, 1.873541870117188e+03, 1.8284912109375e+03, 1.73308203125e+03, 1.647068481445312e+03, 1.615174194335938e+03, 1.602612915039062e+03, 1.587650146484375e+03, 1.565378540039062e+03, 1.5720810546875e+03, 1.616061767578125e+03, 1.754998779296875e+03, 2.061242919921875e+03, 2.276892822265625e+03, 2.2632451171875e+03, 2.266327880859375e+03, 2.31860205078125e+03, 2.368173583984375e+03, 2.391890625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1NoRetrofit.mos b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1NoRetrofit.mos
new file mode 100644
index 00000000..0a33e559
--- /dev/null
+++ b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1NoRetrofit.mos
@@ -0,0 +1,8 @@
+
+simulateModel("BESMod.Examples.Retrofit.Case1NoRetrofit", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="Case1NoRetrofit");
+
+createPlot(id=1, position={75, 70, 1210, 600}, y={"weaDat.weaBus.TDryBul"}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, y={"hydraulic.generation.sigBusGen.TGenOutMea"}, grid=true, subPlot=2, colors={{238,46,47}});
+createPlot(id=1, y={"outputs.building.TZone[1]"}, grid=true, subPlot=3, colors={{0,140,72}});
+createPlot(id=1, y={"electricalGrid.PElecGen","electricalGrid.PElecLoa"}, grid=true, subPlot=4, colors={{28,108,200},{238,46,47}});
+
\ No newline at end of file
diff --git a/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1PartialRetrofit.mos b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1PartialRetrofit.mos
new file mode 100644
index 00000000..b2c7f781
--- /dev/null
+++ b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1PartialRetrofit.mos
@@ -0,0 +1,8 @@
+
+simulateModel("BESMod.Examples.Retrofit.Case1PartialRetrofit", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="Case1PartialRetrofit");
+
+createPlot(id=1, position={75, 70, 1210, 600}, y={"weaDat.weaBus.TDryBul"}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, y={"hydraulic.generation.sigBusGen.TGenOutMea"}, grid=true, subPlot=2, colors={{238,46,47}});
+createPlot(id=1, y={"outputs.building.TZone[1]"}, grid=true, subPlot=3, colors={{0,140,72}});
+createPlot(id=1, y={"electricalGrid.PElecGen","electricalGrid.PElecLoa"}, grid=true, subPlot=4, colors={{28,108,200},{238,46,47}});
+
\ No newline at end of file
diff --git a/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1TotalRetrofit.mos b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1TotalRetrofit.mos
new file mode 100644
index 00000000..4a51c644
--- /dev/null
+++ b/BESMod/Resources/Scripts/Dymola/Examples/Retrofit/Case1TotalRetrofit.mos
@@ -0,0 +1,8 @@
+
+simulateModel("BESMod.Examples.Retrofit.Case1TotalRetrofit", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="Case1TotalRetrofit");
+
+createPlot(id=1, position={75, 70, 1210, 600}, y={"weaDat.weaBus.TDryBul"}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, y={"hydraulic.generation.sigBusGen.TGenOutMea"}, grid=true, subPlot=2, colors={{238,46,47}});
+createPlot(id=1, y={"outputs.building.TZone[1]"}, grid=true, subPlot=3, colors={{0,140,72}});
+createPlot(id=1, y={"electricalGrid.PElecGen","electricalGrid.PElecLoa"}, grid=true, subPlot=4, colors={{28,108,200},{238,46,47}});
+
\ No newline at end of file
diff --git a/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo b/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo
index 24f2a825..873f9823 100644
--- a/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo
+++ b/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo
@@ -96,8 +96,10 @@ partial model PartialBuildingEnergySystem "Partial BES"
hydraulicSystemParameters(
final nZones=systemParameters.nZones,
final Q_flow_nominal=systemParameters.QBui_flow_nominal,
+ final QOld_flow_design=systemParameters.QBuiOld_flow_design,
final TOda_nominal=systemParameters.TOda_nominal,
final TSup_nominal=systemParameters.THydSup_nominal,
+ final TSupOld_design=systemParameters.THydSupOld_design,
final TZone_nominal=systemParameters.TSetZone_nominal,
final TAmb=systemParameters.TAmbHyd,
final AZone=building.AZone,
@@ -126,6 +128,7 @@ partial model PartialBuildingEnergySystem "Partial BES"
ventilationSystemParameters(
final nZones=systemParameters.nZones,
final Q_flow_nominal=systemParameters.QBui_flow_nominal,
+ final QOld_flow_design=systemParameters.QBuiOld_flow_design,
final TOda_nominal=systemParameters.TOda_nominal,
final TSup_nominal=systemParameters.TVenSup_nominal,
final TZone_nominal=systemParameters.TSetZone_nominal,
diff --git a/BESMod/Systems/BaseClasses/PartialSubsystemParameters.mo b/BESMod/Systems/BaseClasses/PartialSubsystemParameters.mo
index 48b6a9db..267fcf5a 100644
--- a/BESMod/Systems/BaseClasses/PartialSubsystemParameters.mo
+++ b/BESMod/Systems/BaseClasses/PartialSubsystemParameters.mo
@@ -10,15 +10,27 @@ model PartialSubsystemParameters "Model for a partial subsystem"
parameter Modelica.Units.SI.Temperature TSup_nominal[nParallelSup]
"Nominal supply temperature" annotation (Dialog(group=
"Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.Temperature TSupOld_design[nParallelSup]=TSup_nominal
+ "Old design supply temperature" annotation (Dialog(group=
+ "Design - Bottom Up: Parameters are defined by the subsystem"));
parameter Modelica.Units.SI.TemperatureDifference dTTra_nominal[nParallelDem]
"Nominal temperature difference for heat transfer" annotation (Dialog(group=
"Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.TemperatureDifference dTTraOld_design[nParallelDem]=dTTra_nominal
+ "Old design temperature difference for heat transfer" annotation (Dialog(group=
+ "Design - Bottom Up: Parameters are defined by the subsystem"));
+
parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nParallelDem](each
min=Modelica.Constants.eps) "Nominal mass flow rate" annotation (Dialog(
group="Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.MassFlowRate mOld_flow_design[nParallelDem](each
+ min=Modelica.Constants.eps)=m_flow_nominal "Old design mass flow rate of old design" annotation (Dialog(
+ group="Design - Bottom Up: Parameters are defined by the subsystem"));
+
parameter Modelica.Units.SI.PressureDifference dp_nominal[nParallelDem]
"Nominal pressure difference at m_flow_nominal" annotation (Dialog(group=
"Design - Bottom Up: Parameters are defined by the subsystem"));
+
parameter Modelica.Units.SI.TemperatureDifference dTLoss_nominal[nParallelDem]=
fill(0, nParallelDem) "Nominal temperature difference due to heat losses"
annotation (Dialog(group=
@@ -34,17 +46,37 @@ model PartialSubsystemParameters "Model for a partial subsystem"
parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal[nParallelDem](each min=Modelica.Constants.eps)
"Nominal heat flow rate" annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
+
+ parameter Modelica.Units.SI.HeatFlowRate QOld_flow_design[nParallelDem](each min=Modelica.Constants.eps) = Q_flow_nominal
+ "Old design heat flow rate" annotation (Dialog(group=
+ "Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.Temperature TOda_nominal
"Nominal outdoor air temperature" annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.Temperature TDem_nominal[nParallelDem]
"Nominal demand temperature" annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.Temperature TDemOld_design[nParallelDem]=TDem_nominal
+ "Old design demand temperature" annotation (Dialog(group=
+ "Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.Temperature TAmb
"Ambient temperature of system. Used to calculate default heat loss."
annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.HeatFlowRate Q_flow_design[nParallelDem](each min=Modelica.Constants.eps) = Q_flow_nominal
+ "Nominal design heat flow rate" annotation (Dialog(group=
+ "Design - Internal: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.MassFlowRate m_flow_design[nParallelDem](each
+ min=Modelica.Constants.eps) = m_flow_nominal "Nominal design mass flow rate" annotation (Dialog(
+ group="Design - Internal: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.TemperatureDifference dTTra_design[nParallelDem] = dTTra_nominal
+ "Nominal design temperature difference for heat transfer" annotation (Dialog(group=
+ "Design - Internal: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.PressureDifference dp_design[nParallelDem] = dp_nominal
+ "Nominal design pressure difference at m_flow_design" annotation (Dialog(group=
+ "Design - Internal: Parameters are defined by the subsystem"));
+
annotation (Icon(graphics,
coordinateSystem(preserveAspectRatio=false)), Diagram(graphics,
coordinateSystem(preserveAspectRatio=false)));
diff --git a/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemROM.mo b/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemROM.mo
index 8a57d0dc..b0ee2e41 100644
--- a/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemROM.mo
+++ b/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemROM.mo
@@ -12,7 +12,8 @@ model CalcHeaDemROM
redeclare BESMod.Systems.Demand.Building.TEASERThermalZone
building(
nZones=1,
- redeclare BESMod.Examples.BAUSimStudy.Buildings.Case_1_retrofit
+ redeclare
+ BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar.Retrofit1918_SingleDwelling
oneZoneParam,
final ventRate=0.5 .- building.zoneParam.baseACH,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
diff --git a/BESMod/Examples/BAUSimStudy/Buildings/Case_1_standard.mo b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1918_SingleDwelling.mo
similarity index 79%
rename from BESMod/Examples/BAUSimStudy/Buildings/Case_1_standard.mo
rename to BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1918_SingleDwelling.mo
index 95e241cd..fced9d31 100644
--- a/BESMod/Examples/BAUSimStudy/Buildings/Case_1_standard.mo
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1918_SingleDwelling.mo
@@ -1,5 +1,6 @@
-within BESMod.Examples.BAUSimStudy.Buildings;
-record Case_1_standard "Case_1_standard_SingleDwelling"
+within BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar;
+record NoRetrofit1918_SingleDwelling
+ "Case 1 with no retrofit from BEStPar"
extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
T_start = 293.15,
withAirCap = true,
@@ -24,20 +25,20 @@ record Case_1_standard "Case_1_standard_SingleDwelling"
AInt = 430.6183333333333,
hConInt = 2.375675675675676,
nInt = 1,
- RInt = {0.00015864610234473541},
- CInt = {66322853.1531042},
+ RInt = {0.0001586461023447354},
+ CInt = {66322853.153104216},
AFloor = 77.008524,
hConFloor = 1.7,
nFloor = 1,
- RFloor = {0.001711324798876134},
- RFloorRem = 0.006462275327484408,
- CFloor = {4991626.335096046},
+ RFloor = {0.0017113247988761297},
+ RFloorRem = 0.006462275327484412,
+ CFloor = {4991626.335096044},
ARoof = 81.7011,
hConRoof = 1.7,
nRoof = 1,
- RRoof = {0.0014751297291351348},
- RRoofRem = 0.005282800406622357,
- CRoof = {5823412.447090039},
+ RRoof = {0.0014751297291351355},
+ RRoofRem = 0.005282800406622356,
+ CRoof = {5823412.447090106},
nOrientationsRoof = 2,
tiltRoof = {0.6108652381980153, 0.6108652381980153},
aziRoof = {3.141592653589793, -1.5707963267948966},
@@ -55,7 +56,7 @@ record Case_1_standard "Case_1_standard_SingleDwelling"
wfWall = {0.25, 0.25, 0.25, 0.25},
wfWin = {0.25, 0.25, 0.25, 0.25},
wfGro = 0.0,
- specificPeople = 0.02,
+ specificPeople = 0.028640985249892597,
internalGainsMoistureNoPeople = 0.5,
fixedHeatFlowRatePersons = 70,
activityDegree = 1.2,
@@ -82,12 +83,12 @@ record Case_1_standard "Case_1_standard_SingleDwelling"
HeaterOn = false,
hCool = 0,
lCool = -17426.160522476486,
+ heaLoadFacOut = 523.0659171555374,
+ heaLoadFacGrd = 98.2930247856132,
KRCool = 10000,
TNCool = 1,
CoolerOn = false,
withIdealThresholds = false,
TThresholdHeater = 288.15,
- TThresholdCooler = 295.15,
- heaLoadFacGrd=0,
- heaLoadFacOut=0);
-end Case_1_standard;
+ TThresholdCooler = 295.15);
+end NoRetrofit1918_SingleDwelling;
diff --git a/BESMod/Examples/BAUSimStudy/Buildings/Case_2_standard.mo b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1983_SingleDwelling.mo
similarity index 83%
rename from BESMod/Examples/BAUSimStudy/Buildings/Case_2_standard.mo
rename to BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1983_SingleDwelling.mo
index c2ab0f17..3f96dd00 100644
--- a/BESMod/Examples/BAUSimStudy/Buildings/Case_2_standard.mo
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/NoRetrofit1983_SingleDwelling.mo
@@ -1,5 +1,6 @@
-within BESMod.Examples.BAUSimStudy.Buildings;
-record Case_2_standard "Case_2_standard_SingleDwelling"
+within BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar;
+record NoRetrofit1983_SingleDwelling
+ "Case 2 with no retrofit from BEStPar"
extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
T_start = 293.15,
withAirCap = true,
@@ -24,20 +25,20 @@ record Case_2_standard "Case_2_standard_SingleDwelling"
AInt = 481.7708333333333,
hConInt = 2.375675675675676,
nInt = 1,
- RInt = {0.00013015347323843435},
+ RInt = {0.00013015347323843437},
CInt = {53342685.29149853},
AFloor = 60.3125,
hConFloor = 1.7000000000000002,
nFloor = 1,
- RFloor = {0.0019728513255291387},
+ RFloor = {0.0019728513255291382},
RFloorRem = 0.02008642858073828,
- CFloor = {7138683.274600956},
+ CFloor = {7138683.274600965},
ARoof = 72.9171875,
hConRoof = 1.7,
nRoof = 1,
- RRoof = {0.0006832497704212157},
+ RRoof = {0.0006832497704212155},
RRoofRem = 0.024123570122556226,
- CRoof = {1365260.5804523209},
+ CRoof = {1365260.5804522675},
nOrientationsRoof = 2,
tiltRoof = {0.6108652381980153, 0.6108652381980153},
aziRoof = {3.141592653589793, -1.5707963267948966},
@@ -55,7 +56,7 @@ record Case_2_standard "Case_2_standard_SingleDwelling"
wfWall = {0.25, 0.25, 0.25, 0.25},
wfWin = {0.25, 0.25, 0.25, 0.25},
wfGro = 0.0,
- specificPeople = 0.02,
+ specificPeople = 0.0256,
internalGainsMoistureNoPeople = 0.5,
fixedHeatFlowRatePersons = 70,
activityDegree = 1.2,
@@ -82,12 +83,12 @@ record Case_2_standard "Case_2_standard_SingleDwelling"
HeaterOn = false,
hCool = 0,
lCool = -7900.6642834489085,
+ heaLoadFacOut = 237.9795439100343,
+ heaLoadFacGrd = 40.75983976111587,
KRCool = 10000,
TNCool = 1,
CoolerOn = false,
withIdealThresholds = false,
TThresholdHeater = 288.15,
- TThresholdCooler = 295.15,
- heaLoadFacGrd=0,
- heaLoadFacOut=0);
-end Case_2_standard;
+ TThresholdCooler = 295.15);
+end NoRetrofit1983_SingleDwelling;
diff --git a/BESMod/Examples/BAUSimStudy/Buildings/Case_1_retrofit.mo b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1918_SingleDwelling.mo
similarity index 81%
rename from BESMod/Examples/BAUSimStudy/Buildings/Case_1_retrofit.mo
rename to BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1918_SingleDwelling.mo
index 82647c76..0c61db01 100644
--- a/BESMod/Examples/BAUSimStudy/Buildings/Case_1_retrofit.mo
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1918_SingleDwelling.mo
@@ -1,5 +1,5 @@
-within BESMod.Examples.BAUSimStudy.Buildings;
-record Case_1_retrofit "Case_1_retrofit_SingleDwelling"
+within BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar;
+record Retrofit1918_SingleDwelling "Case 1 retrofit from BEStPar"
extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
T_start = 293.15,
withAirCap = true,
@@ -20,24 +20,24 @@ record Case_1_retrofit "Case_1_retrofit_SingleDwelling"
nExt = 1,
RExt = {0.0006701540459780769},
RExtRem = 0.020216675755004247,
- CExt = {100421538.7287612},
+ CExt = {100421538.72876121},
AInt = 430.6183333333333,
hConInt = 2.375675675675676,
nInt = 1,
- RInt = {0.00015864610234473541},
- CInt = {66322853.1531042},
+ RInt = {0.0001586461023447354},
+ CInt = {66322853.153104216},
AFloor = 77.008524,
hConFloor = 1.7,
nFloor = 1,
- RFloor = {0.0017094806036435206},
+ RFloor = {0.0017094806036435201},
RFloorRem = 0.03639477492651585,
- CFloor = {3229375.807286302},
+ CFloor = {3229375.8072862974},
ARoof = 81.7011,
hConRoof = 1.7,
nRoof = 1,
- RRoof = {0.0006642141886533201},
+ RRoof = {0.0006642141886533192},
RRoofRem = 0.031467177775802616,
- CRoof = {1563249.5296817843},
+ CRoof = {1563249.529681784},
nOrientationsRoof = 2,
tiltRoof = {0.6108652381980153, 0.6108652381980153},
aziRoof = {3.141592653589793, -1.5707963267948966},
@@ -55,7 +55,7 @@ record Case_1_retrofit "Case_1_retrofit_SingleDwelling"
wfWall = {0.25, 0.25, 0.25, 0.25},
wfWin = {0.25, 0.25, 0.25, 0.25},
wfGro = 0.0,
- specificPeople = 0.02,
+ specificPeople = 0.028640985249892597,
internalGainsMoistureNoPeople = 0.5,
fixedHeatFlowRatePersons = 70,
activityDegree = 1.2,
@@ -82,12 +82,12 @@ record Case_1_retrofit "Case_1_retrofit_SingleDwelling"
HeaterOn = false,
hCool = 0,
lCool = -4473.482346425267,
+ heaLoadFacOut = 134.33381091345322,
+ heaLoadFacGrd = 24.971485313537734,
KRCool = 10000,
TNCool = 1,
CoolerOn = false,
withIdealThresholds = false,
TThresholdHeater = 288.15,
- TThresholdCooler = 295.15,
- heaLoadFacGrd=0,
- heaLoadFacOut=0);
-end Case_1_retrofit;
+ TThresholdCooler = 295.15);
+end Retrofit1918_SingleDwelling;
diff --git a/BESMod/Examples/BAUSimStudy/Buildings/Case_2_retrofit.mo b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1983_SingleDwelling.mo
similarity index 82%
rename from BESMod/Examples/BAUSimStudy/Buildings/Case_2_retrofit.mo
rename to BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1983_SingleDwelling.mo
index e642eeb8..9ba86d0e 100644
--- a/BESMod/Examples/BAUSimStudy/Buildings/Case_2_retrofit.mo
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/Retrofit1983_SingleDwelling.mo
@@ -1,5 +1,6 @@
-within BESMod.Examples.BAUSimStudy.Buildings;
-record Case_2_retrofit "Case_2_retrofit_SingleDwelling"
+within BESMod.Systems.Demand.Building.RecordsCollection.ACoolHeadAndBEStPar;
+record Retrofit1983_SingleDwelling
+ "Case 2 with retrofit from BEStPar"
extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
T_start = 293.15,
withAirCap = true,
@@ -18,26 +19,26 @@ record Case_2_retrofit "Case_2_retrofit_SingleDwelling"
AExt = {28.828125, 28.828125, 28.828125, 28.828125},
hConExt = 2.7,
nExt = 1,
- RExt = {0.002635720568811437},
+ RExt = {0.002635720568811436},
RExtRem = 0.0391791526753142,
CExt = {34205984.307940625},
AInt = 481.7708333333333,
hConInt = 2.375675675675676,
nInt = 1,
- RInt = {0.00013015347323843435},
+ RInt = {0.00013015347323843437},
CInt = {53342685.29149853},
AFloor = 60.3125,
hConFloor = 1.7000000000000002,
nFloor = 1,
- RFloor = {0.007240378276725048},
+ RFloor = {0.007240378276725046},
RFloorRem = 0.05271675507143726,
- CFloor = {4264027.844552503},
+ CFloor = {4264027.844552502},
ARoof = 72.9171875,
hConRoof = 1.7,
nRoof = 1,
- RRoof = {0.0007442282362931753},
+ RRoof = {0.0007442282362931743},
RRoofRem = 0.03525784696754283,
- CRoof = {1395180.2248083546},
+ CRoof = {1395180.2248083986},
nOrientationsRoof = 2,
tiltRoof = {0.6108652381980153, 0.6108652381980153},
aziRoof = {3.141592653589793, -1.5707963267948966},
@@ -55,7 +56,7 @@ record Case_2_retrofit "Case_2_retrofit_SingleDwelling"
wfWall = {0.25, 0.25, 0.25, 0.25},
wfWin = {0.25, 0.25, 0.25, 0.25},
wfGro = 0.0,
- specificPeople = 0.02,
+ specificPeople = 0.0256,
internalGainsMoistureNoPeople = 0.5,
fixedHeatFlowRatePersons = 70,
activityDegree = 1.2,
@@ -82,12 +83,12 @@ record Case_2_retrofit "Case_2_retrofit_SingleDwelling"
HeaterOn = false,
hCool = 0,
lCool = -3362.8545215039794,
+ heaLoadFacOut = 101.585380796127,
+ heaLoadFacGrd = 16.0174765754165,
KRCool = 10000,
TNCool = 1,
CoolerOn = false,
withIdealThresholds = false,
TThresholdHeater = 288.15,
- TThresholdCooler = 295.15,
- heaLoadFacGrd=0,
- heaLoadFacOut=0);
-end Case_2_retrofit;
+ TThresholdCooler = 295.15);
+end Retrofit1983_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.mo b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.mo
new file mode 100644
index 00000000..95a5686e
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.mo
@@ -0,0 +1,4 @@
+within BESMod.Systems.Demand.Building.RecordsCollection;
+package ACoolHeadAndBEStPar "Typical buildings from ACoolHead used in BEStPar"
+ extends Modelica.Icons.RecordsPackage;
+end ACoolHeadAndBEStPar;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.order b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.order
new file mode 100644
index 00000000..fd9231e7
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/ACoolHeadAndBEStPar/package.order
@@ -0,0 +1,4 @@
+NoRetrofit1918_SingleDwelling
+NoRetrofit1983_SingleDwelling
+Retrofit1918_SingleDwelling
+Retrofit1983_SingleDwelling
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/RefAachen.mo b/BESMod/Systems/Demand/Building/RecordsCollection/RefAachen.mo
index 1eb975ae..223832b2 100644
--- a/BESMod/Systems/Demand/Building/RecordsCollection/RefAachen.mo
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/RefAachen.mo
@@ -1,13 +1,13 @@
within BESMod.Systems.Demand.Building.RecordsCollection;
record RefAachen "Reference Building for Aachen"
extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
- T_start=293.15,
+ T_start = 293.15,
withAirCap = true,
VAir = 483.48248,
AZone = 185.9548,
hRad = 5.000000000000001,
- lat=0.88645272708792,
- final nOrientations = 4,
+ lat = 0.88645272708792,
+ nOrientations = 4,
AWin = {9.2047626, 9.2047626, 9.2047626, 9.2047626},
ATransparent = {9.2047626, 9.2047626, 9.2047626, 9.2047626},
hConWin = 2.7,
@@ -24,39 +24,38 @@ record RefAachen "Reference Building for Aachen"
AInt = 588.8568666666666,
hConInt = 2.3842105263157896,
nInt = 1,
- RInt = {0.00010636057128817268},
+ RInt = {0.00010636057128817274},
CInt = {64367784.53377798},
AFloor = 93.3493096,
hConFloor = 1.7,
nFloor = 1,
- RFloor = {0.0012921516953637504},
+ RFloor = {0.001292151695363751},
RFloorRem = 0.016987471113660366,
- CFloor = {11025394.529932633},
+ CFloor = {11025394.529932635},
ARoof = 152.72467724,
hConRoof = 1.7,
nRoof = 1,
- RRoof = {0.00035532587679531027},
+ RRoof = {0.0003553258767953098},
RRoofRem = 0.016833579776623572,
- CRoof = {2922197.863507833},
+ CRoof = {2922197.8635078324},
nOrientationsRoof = 2,
- tiltRoof={0.61086523819802,0.61086523819802},
- aziRoof={3.1415926535898,-1.5707963267949},
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
wfRoof = {0.5, 0.5},
aRoof = 0.5,
aExt = 0.5,
- TSoil=286.15,
+ TSoil = 286.15,
hConWallOut = 20.0,
hRadWall = 5.0,
hConWinOut = 20.0,
hConRoofOut = 20.0,
hRadRoof = 5.0,
- tiltExtWalls={1.5707963267949,1.5707963267949,1.5707963267949,
- 1.5707963267949},
- aziExtWalls={0,1.5707963267949,-1.5707963267949,3.1415926535898},
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
wfWall = {0.25, 0.25, 0.25, 0.25},
wfWin = {0.25, 0.25, 0.25, 0.25},
wfGro = 0.0,
- specificPeople = 0.02,
+ specificPeople = 0.021510603652070286,
internalGainsMoistureNoPeople = 0.5,
fixedHeatFlowRatePersons = 70,
activityDegree = 1.2,
@@ -80,15 +79,15 @@ record RefAachen "Reference Building for Aachen"
lHeat = 0,
KRHeat = 10000,
TNHeat = 1,
- HeaterOn=false,
+ HeaterOn = false,
hCool = 0,
lCool = -10987.666680836159,
+ heaLoadFacOut = 332.360230262213,
+ heaLoadFacGrd = 50.30561606362036,
KRCool = 10000,
TNCool = 1,
CoolerOn = false,
withIdealThresholds = false,
- TThresholdHeater=288.15,
- TThresholdCooler=295.15,
- heaLoadFacGrd=0,
- heaLoadFacOut=0);
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
end RefAachen;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..c48900e5
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1859_retrofit_SingleDwelling "B1859_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 547.5,
+ AZone = 219.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {7.199625, 7.199625, 7.199625, 7.199625},
+ ATransparent = {7.199625, 7.199625, 7.199625, 7.199625},
+ hConWin = 2.6999999999999997,
+ RWin = 0.015799433998298522,
+ gWin = 0.6,
+ UWin= 1.6003325366309882,
+ ratioWinConRad = 0.02,
+ AExt = {42.447675, 42.447675, 42.447675, 42.447675},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.009233993964388523},
+ RExtRem = 0.006400353174357467,
+ CExt = {12174215.889660235},
+ AInt = 675.25,
+ hConInt = 2.3756756756756765,
+ nInt = 1,
+ RInt = {0.00010117129978751481},
+ CInt = {104000464.27416456},
+ AFloor = 85.4976,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.003148024293651912},
+ RFloorRem = 0.020916077730120393,
+ CFloor = {5616921.559813438},
+ ARoof = 134.24699999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00040423271915635884},
+ RRoofRem = 0.019150543685733216,
+ CRoof = {2568650.356129808},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 19.999999999999996,
+ hRadRoof = 4.999999999999999,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.0182648401826484,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 6415.16916878181,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -6415.16916878181,
+ heaLoadFacOut = 191.9985765735018,
+ heaLoadFacGrd = 38.744959775678986,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1859_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_standard_SingleDwelling.mo
new file mode 100644
index 00000000..0e11d4b4
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1859_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1859_standard_SingleDwelling "B1859_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 547.5,
+ AZone = 219.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {7.199625, 7.199625, 7.199625, 7.199625},
+ ATransparent = {7.199625, 7.199625, 7.199625, 7.199625},
+ hConWin = 2.6999999999999997,
+ RWin = 0.006498354328970507,
+ gWin = 0.75,
+ UWin= 2.8010185522008,
+ ratioWinConRad = 0.02,
+ AExt = {42.447675, 42.447675, 42.447675, 42.447675},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0003217816807088066},
+ RExtRem = 0.0016092360514697898,
+ CExt = {19534483.054724682},
+ AInt = 675.25,
+ hConInt = 2.3756756756756765,
+ nInt = 1,
+ RInt = {0.00010117129978751481},
+ CInt = {104000464.27416456},
+ AFloor = 85.4976,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0003438900019788039},
+ RFloorRem = 0.0017201514241582353,
+ CFloor = {25833369.65799868},
+ ARoof = 134.24699999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00025796801152449807},
+ RRoofRem = 0.0010544670983139057,
+ CRoof = {2172257.9166934565},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 19.999999999999996,
+ hRadRoof = 4.999999999999999,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.0182648401826484,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 28309.0369830377,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -28309.0369830377,
+ heaLoadFacOut = 827.2389113803055,
+ heaLoadFacGrd = 262.48454555256063,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1859_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..fe4ec31b
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1918_retrofit_SingleDwelling "B1918_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 355.0,
+ AZone = 142.0,
+ hRad = 5.000000000000001,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {5.5735, 5.5735, 5.5735, 5.5735},
+ ATransparent = {5.5735, 5.5735, 5.5735, 5.5735},
+ hConWin = 2.6999999999999997,
+ RWin = 0.020409078675876918,
+ gWin = 0.6,
+ UWin= 1.6003325366309882,
+ ratioWinConRad = 0.02,
+ AExt = {48.493, 48.493, 48.493, 48.493},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0006591106624035085},
+ RExtRem = 0.019883527717914743,
+ CExt = {102104099.23731989},
+ AInt = 437.83333333333337,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {0.0001560317933342658},
+ CInt = {67434090.99055417},
+ AFloor = 78.2988,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0016813102894708031},
+ RFloorRem = 0.03579503004392397,
+ CFloor = {3283483.922631063},
+ ARoof = 83.07,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.0006532686872346659},
+ RRoofRem = 0.030948634142032343,
+ CRoof = {1589441.7386139221},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.028169014084507043,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 4548.435437436546,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -4548.435437436546,
+ heaLoadFacOut = 136.58457074115967,
+ heaLoadFacGrd = 25.389881959919506,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1918_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_standard_SingleDwelling.mo
new file mode 100644
index 00000000..2860b6cb
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1918_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1918_standard_SingleDwelling "B1918_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 355.0,
+ AZone = 142.0,
+ hRad = 5.000000000000001,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {5.5735, 5.5735, 5.5735, 5.5735},
+ ATransparent = {5.5735, 5.5735, 5.5735, 5.5735},
+ hConWin = 2.6999999999999997,
+ RWin = 0.008394314934191134,
+ gWin = 0.75,
+ UWin= 2.8010185522007998,
+ ratioWinConRad = 0.02,
+ AExt = {48.493, 48.493, 48.493, 48.493},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.00035415426634912654},
+ RExtRem = 0.0017764010740016502,
+ CExt = {68710642.83154373},
+ AInt = 437.83333333333337,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {0.0001560317933342658},
+ CInt = {67434090.99055417},
+ AFloor = 78.2988,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.001683124094443998},
+ RFloorRem = 0.006355784311524406,
+ CFloor = {5075260.916394258},
+ ARoof = 83.07,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.001450821253316993},
+ RRoofRem = 0.005195745808372382,
+ CRoof = {5920983.585040778},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.028169014084507043,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 17718.135430271097,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -17718.135430271097,
+ heaLoadFacOut = 531.8298742380517,
+ heaLoadFacGrd = 99.93992209334868,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1918_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..e9a0ae1c
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1948_retrofit_SingleDwelling "B1948_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 757.5,
+ AZone = 303.0,
+ hRad = 5.000000000000001,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {13.10475, 13.10475, 13.10475, 13.10475},
+ ATransparent = {13.10475, 13.10475, 13.10475, 13.10475},
+ hConWin = 2.7,
+ RWin = 0.011431556672785996,
+ gWin = 0.6,
+ UWin= 1.3002195175808904,
+ ratioWinConRad = 0.019999999999999997,
+ AExt = {58.82745, 58.82745, 58.82745, 58.82745},
+ hConExt = 2.7000000000000006,
+ nExt = 1,
+ RExt = {0.0005433220945652639},
+ RExtRem = 0.016390510036128365,
+ CExt = {123863728.63461682},
+ AInt = 934.25,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {7.31238107375107e-05},
+ CInt = {143891053.31083038},
+ AFloor = 144.90066,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0008488311695678109},
+ RFloorRem = 0.02085731718654831,
+ CFloor = {1986774.066754559},
+ ARoof = 214.0089,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.0006854332728039563},
+ RRoofRem = 0.01258249989405464,
+ CRoof = {2007257.8326098348},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.013201320132013201,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 8249.143385796784,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -8249.143385796784,
+ heaLoadFacOut = 248.16450584056946,
+ heaLoadFacGrd = 43.98274269979441,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1948_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_standard_SingleDwelling.mo
new file mode 100644
index 00000000..582794e0
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1948_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1948_standard_SingleDwelling "B1948_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 757.5,
+ AZone = 303.0,
+ hRad = 5.000000000000001,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {13.10475, 13.10475, 13.10475, 13.10475},
+ ATransparent = {13.10475, 13.10475, 13.10475, 13.10475},
+ hConWin = 2.7,
+ RWin = 0.0035701340571712,
+ gWin = 0.7500000000000001,
+ UWin= 2.8010185522008,
+ ratioWinConRad = 0.019999999999999997,
+ AExt = {58.82745, 58.82745, 58.82745, 58.82745},
+ hConExt = 2.7000000000000006,
+ nExt = 1,
+ RExt = {0.0002919385905400998},
+ RExtRem = 0.0014643336959457198,
+ CExt = {83353719.2097931},
+ AInt = 934.25,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {7.31238107375107e-05},
+ CInt = {143891053.31083038},
+ AFloor = 144.90066,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0005533095109129569},
+ RFloorRem = 0.006145293851252312,
+ CFloor = {6086793.322323241},
+ ARoof = 214.0089,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.0004044748114709851},
+ RRoofRem = 0.001954127586662479,
+ CRoof = {1475117.9417704665},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.013201320132013201,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 30071.23821395618,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -30071.23821395618,
+ heaLoadFacOut = 911.42239753792,
+ heaLoadFacGrd = 129.3887846775343,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1948_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..97ac98e4
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1950_retrofit_SingleDwelling "B1950_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 277.5,
+ AZone = 111.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {4.6065000000000005, 4.6065000000000005, 4.6065000000000005, 4.6065000000000005},
+ ATransparent = {4.6065000000000005, 4.6065000000000005, 4.6065000000000005, 4.6065000000000005},
+ hConWin = 2.7,
+ RWin = 0.03252093613539396,
+ gWin = 0.6,
+ UWin= 1.3002195175808902,
+ ratioWinConRad = 0.02,
+ AExt = {29.451074999999996, 29.451074999999996, 29.451074999999996, 29.451074999999996},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.00046855730992867325},
+ RExtRem = 0.021708545828141027,
+ CExt = {21190295.281935558},
+ AInt = 342.25,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0002043410979891165},
+ CInt = {45966912.987976894},
+ AFloor = 79.92000000000002,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.0009524348832621435},
+ RFloorRem = 0.03834701352092044,
+ CFloor = {2915321.7843715698},
+ ARoof = 125.42999999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.0004326479299097799},
+ RRoofRem = 0.02049671560375211,
+ CRoof = {2399947.9628547523},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 19.999999999999996,
+ hRadRoof = 4.999999999999999,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.036036036036036036,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 4335.552040100903,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -4335.552040100903,
+ heaLoadFacOut = 130.1727346688655,
+ heaLoadFacGrd = 24.289218671029502,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1950_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_standard_SingleDwelling.mo
new file mode 100644
index 00000000..b02e5bb6
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1950_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1950_standard_SingleDwelling "B1950_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 277.5,
+ AZone = 111.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {4.6065000000000005, 4.6065000000000005, 4.6065000000000005, 4.6065000000000005},
+ ATransparent = {4.6065000000000005, 4.6065000000000005, 4.6065000000000005, 4.6065000000000005},
+ hConWin = 2.7,
+ RWin = 0.010156455939588468,
+ gWin = 0.75,
+ UWin= 2.8010185522008006,
+ ratioWinConRad = 0.02,
+ AExt = {29.451074999999996, 29.451074999999996, 29.451074999999996, 29.451074999999996},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0004622629192021804},
+ RExtRem = 0.00425246527039062,
+ CExt = {22263753.15957834},
+ AInt = 342.25,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0002043410979891165},
+ CInt = {45966912.987976894},
+ AFloor = 79.92000000000002,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.0012116287988822715},
+ RFloorRem = 0.009595819465643208,
+ CFloor = {3890567.2987432457},
+ ARoof = 125.42999999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.000713720273657382},
+ RRoofRem = 0.0032162211888192185,
+ CRoof = {5336891.385522557},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 19.999999999999996,
+ hRadRoof = 4.999999999999999,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.036036036036036036,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 13901.737210615745,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -13901.737210615745,
+ heaLoadFacOut = 417.21042992861675,
+ heaLoadFacGrd = 78.71477898571554,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1950_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..05dc1abc
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1960_retrofit_SingleDwelling "B1960_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 302.5,
+ AZone = 121.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {6.776, 6.776, 6.776, 6.776},
+ ATransparent = {6.776, 6.776, 6.776, 6.776},
+ hConWin = 2.7000000000000006,
+ RWin = 0.02210857324493688,
+ gWin = 0.6,
+ UWin= 1.3002195175808906,
+ ratioWinConRad = 0.02,
+ AExt = {37.479749999999996, 37.479749999999996, 37.479749999999996, 37.479749999999996},
+ hConExt = 2.700000000000001,
+ nExt = 1,
+ RExt = {0.0014048852217831758},
+ RExtRem = 0.027959342703580574,
+ CExt = {45806659.354824},
+ AInt = 373.08333333333337,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {0.00018745340394042914},
+ CInt = {50108076.320227064},
+ AFloor = 115.797,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.0019519789837071488},
+ RFloorRem = 0.022900294740131853,
+ CFloor = {5953470.756035121},
+ ARoof = 168.916,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00032126636818645773},
+ RRoofRem = 0.015220008987772779,
+ CRoof = {3231998.8048598683},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 19.999999999999996,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.24999999999999994, 0.24999999999999994, 0.24999999999999994, 0.24999999999999994},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.03305785123966942,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 5038.874733167491,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -5038.874733167491,
+ heaLoadFacOut = 149.0968184622839,
+ heaLoadFacGrd = 38.25379176777235,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1960_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_standard_SingleDwelling.mo
new file mode 100644
index 00000000..7df884bd
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1960_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1960_standard_SingleDwelling "B1960_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 302.5,
+ AZone = 121.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {6.776, 6.776, 6.776, 6.776},
+ ATransparent = {6.776, 6.776, 6.776, 6.776},
+ hConWin = 2.7000000000000006,
+ RWin = 0.0069046213526733,
+ gWin = 0.75,
+ UWin= 2.8010185522008006,
+ ratioWinConRad = 0.02,
+ AExt = {37.479749999999996, 37.479749999999996, 37.479749999999996, 37.479749999999996},
+ hConExt = 2.700000000000001,
+ nExt = 1,
+ RExt = {0.0007642133834660376},
+ RExtRem = 0.003723513931215582,
+ CExt = {30867535.05522987},
+ AInt = 373.08333333333337,
+ hConInt = 2.3756756756756756,
+ nInt = 1,
+ RInt = {0.00018745340394042914},
+ CInt = {50108076.320227064},
+ AFloor = 115.797,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.000974252852073266},
+ RFloorRem = 0.004139044164991941,
+ CFloor = {14692659.202720912},
+ ARoof = 168.916,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00027420347202903255},
+ RRoofRem = 0.005601598742105336,
+ CRoof = {3075139.723318416},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 19.999999999999996,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25000000000000006, 0.25000000000000006, 0.25000000000000006, 0.25000000000000006},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.03305785123966942,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 14452.454546292447,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -14452.454546292447,
+ heaLoadFacOut = 417.4713836351744,
+ heaLoadFacGrd = 156.1957528524095,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1960_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..476eb508
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1970_retrofit_SingleDwelling "B1970_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 432.5,
+ AZone = 173.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {8.550524999999999, 8.550524999999999, 8.550524999999999, 8.550524999999999},
+ ATransparent = {8.550524999999999, 8.550524999999999, 8.550524999999999, 8.550524999999999},
+ hConWin = 2.7000000000000006,
+ RWin = 0.017520291713981576,
+ gWin = 0.6,
+ UWin= 1.3002195175808904,
+ ratioWinConRad = 0.02,
+ AExt = {44.40045, 44.40045, 44.40045, 44.40045},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0013316729182496505},
+ RExtRem = 0.02419711026656748,
+ CExt = {63062482.440269046},
+ AInt = 533.4166666666666,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0001269809451310076},
+ CInt = {114239751.22974624},
+ AFloor = 152.2919,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.002052317156680992},
+ RFloorRem = 0.019456579454427584,
+ CFloor = {9087635.388483815},
+ ARoof = 183.09974000000003,
+ hConRoof = 1.7000000000000002,
+ nRoof = 1,
+ RRoof = {0.0002431290432163527},
+ RRoofRem = 0.024478028129514308,
+ CRoof = {77562534.2944897},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.023121387283236993,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 5148.028398300922,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -5148.028398300922,
+ heaLoadFacOut = 151.14965817098562,
+ heaLoadFacGrd = 44.4627624041975,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1970_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_standard_SingleDwelling.mo
new file mode 100644
index 00000000..87bdb08a
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1970_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1970_standard_SingleDwelling "B1970_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 432.5,
+ AZone = 173.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {8.550524999999999, 8.550524999999999, 8.550524999999999, 8.550524999999999},
+ ATransparent = {8.550524999999999, 8.550524999999999, 8.550524999999999, 8.550524999999999},
+ hConWin = 2.7000000000000006,
+ RWin = 0.005471677386559807,
+ gWin = 0.75,
+ UWin= 2.8010185522008,
+ ratioWinConRad = 0.02,
+ AExt = {44.40045, 44.40045, 44.40045, 44.40045},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0007645254039284439},
+ RExtRem = 0.0038506988288639094,
+ CExt = {47055007.88491205},
+ AInt = 533.4166666666666,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0001269809451310076},
+ CInt = {114239751.22974624},
+ AFloor = 152.2919,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0009090244736742132},
+ RFloorRem = 0.0051132717138606,
+ CFloor = {17987183.417955577},
+ ARoof = 183.09974000000003,
+ hConRoof = 1.7000000000000002,
+ nRoof = 1,
+ RRoof = {0.00023750199287788138},
+ RRoofRem = 0.00986889828203682,
+ CRoof = {76627333.25752135},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.023121387283236993,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 13643.443122666335,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -13643.443122666335,
+ heaLoadFacOut = 395.14077375282335,
+ heaLoadFacGrd = 142.70548036799818,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1970_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..70720b50
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1980_retrofit_SingleDwelling "B1980_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 540.0,
+ AZone = 216.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {6.75, 6.75, 6.75, 6.75},
+ ATransparent = {6.75, 6.75, 6.75, 6.75},
+ hConWin = 2.7,
+ RWin = 0.02219373219373219,
+ gWin = 0.6,
+ UWin= 1.3002195175808906,
+ ratioWinConRad = 0.02,
+ AExt = {39.852, 39.852, 39.852, 39.852},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.001906626568874014},
+ RExtRem = 0.028341400951471498,
+ CExt = {47286352.70729713},
+ AInt = 666.0,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {9.415037126622853e-05},
+ CInt = {73740928.1469676},
+ AFloor = 83.376,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.005237542156195779},
+ RFloorRem = 0.03813422675885219,
+ CFloor = {5894592.092309378},
+ ARoof = 100.80072,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.000538359545929669},
+ RRoofRem = 0.02550480828091929,
+ CRoof = {1928697.14277513},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.018518518518518517,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 4648.810090527101,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -4648.810090527101,
+ heaLoadFacOut = 140.43163041256597,
+ heaLoadFacGrd = 22.142559617855767,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1980_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_standard_SingleDwelling.mo
new file mode 100644
index 00000000..649bb221
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1980_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1980_standard_SingleDwelling "B1980_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 540.0,
+ AZone = 216.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {6.75, 6.75, 6.75, 6.75},
+ ATransparent = {6.75, 6.75, 6.75, 6.75},
+ hConWin = 2.7,
+ RWin = 0.0023169681309216186,
+ gWin = 0.75,
+ UWin= 4.3024026404355675,
+ ratioWinConRad = 0.02,
+ AExt = {39.852, 39.852, 39.852, 39.852},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.001147234213263944},
+ RExtRem = 0.005800295751841475,
+ CExt = {37750786.90675228},
+ AInt = 666.0,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {9.415037126622853e-05},
+ CInt = {73740928.1469676},
+ AFloor = 83.376,
+ hConFloor = 1.6999999999999997,
+ nFloor = 1,
+ RFloor = {0.0014271204611755917},
+ RFloorRem = 0.014530113267316465,
+ CFloor = {9868515.758808367},
+ ARoof = 100.80072,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.0004942489658718282},
+ RRoofRem = 0.017450499220599124,
+ CRoof = {1887336.2264171417},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.018518518518518517,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 10921.87830543977,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -10921.87830543977,
+ heaLoadFacOut = 328.9829215012314,
+ heaLoadFacGrd = 56.34640248576658,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1980_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..1db85181
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1994_retrofit_SingleDwelling "B1994_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 375.0,
+ AZone = 150.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {7.425000000000001, 7.425000000000001, 7.425000000000001, 7.425000000000001},
+ ATransparent = {7.425000000000001, 7.425000000000001, 7.425000000000001, 7.425000000000001},
+ hConWin = 2.6999999999999993,
+ RWin = 0.02017612017612017,
+ gWin = 0.6,
+ UWin= 1.3002195175808902,
+ ratioWinConRad = 0.02,
+ AExt = {52.8375, 52.8375, 52.8375, 52.8375},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.002622209961045645},
+ RExtRem = 0.023941715822184604,
+ CExt = {13329040.594542462},
+ AInt = 462.5,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0001336340138456164},
+ CInt = {51200270.26756811},
+ AFloor = 75.3,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.006746132457144518},
+ RFloorRem = 0.04626986295700023,
+ CFloor = {5578508.882817548},
+ ARoof = 123.19500000000001,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00044049701569530983},
+ RRoofRem = 0.020868566404307207,
+ CRoof = {2357184.0013066344},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 19.999999999999996,
+ hRadWall = 4.999999999999999,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.02666666666666667,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 4767.996027530474,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -4767.996027530474,
+ heaLoadFacOut = 145.02246693791852,
+ heaLoadFacGrd = 18.182440788154498,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1994_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_standard_SingleDwelling.mo
new file mode 100644
index 00000000..91ba060c
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B1994_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B1994_standard_SingleDwelling "B1994_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 375.0,
+ AZone = 150.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {7.425000000000001, 7.425000000000001, 7.425000000000001, 7.425000000000001},
+ ATransparent = {7.425000000000001, 7.425000000000001, 7.425000000000001, 7.425000000000001},
+ hConWin = 2.6999999999999993,
+ RWin = 0.004797979797979797,
+ gWin = 0.75,
+ UWin= 3.2013304230329487,
+ ratioWinConRad = 0.02,
+ AExt = {52.8375, 52.8375, 52.8375, 52.8375},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.001497265097748756},
+ RExtRem = 0.007492562202937309,
+ CExt = {8454199.790403917},
+ AInt = 462.5,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.0001336340138456164},
+ CInt = {51200270.26756811},
+ AFloor = 75.3,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0016018787338735148},
+ RFloorRem = 0.02105934528964327,
+ CFloor = {8893608.444040682},
+ ARoof = 123.19500000000001,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00044049701569530983},
+ RRoofRem = 0.020868566404307207,
+ CRoof = {2357184.0013066344},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 19.999999999999996,
+ hRadWall = 4.999999999999999,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.02666666666666667,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 8829.775363719697,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -8829.775363719697,
+ heaLoadFacOut = 267.05384435804797,
+ heaLoadFacGrd = 40.57890632316592,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B1994_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_retrofit_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_retrofit_SingleDwelling.mo
new file mode 100644
index 00000000..f54d5b18
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_retrofit_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B2001_retrofit_SingleDwelling "B2001_retrofit_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 305.0,
+ AZone = 122.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {8.113, 8.113, 8.113, 8.113},
+ ATransparent = {8.113, 8.113, 8.113, 8.113},
+ hConWin = 2.7,
+ RWin = 0.018465141415961086,
+ gWin = 0.6,
+ UWin= 1.3002195175808906,
+ ratioWinConRad = 0.02,
+ AExt = {31.659000000000002, 31.659000000000002, 31.659000000000002, 31.659000000000002},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.0011023502273761463},
+ RExtRem = 0.05046159165558613,
+ CExt = {24527880.745831817},
+ AInt = 376.16666666666663,
+ hConInt = 2.3756756756756765,
+ nInt = 1,
+ RInt = {0.00017892706852343755},
+ CInt = {43130867.86628312},
+ AFloor = 84.30199999999999,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.006788156357322471},
+ RFloorRem = 0.046215270973886474,
+ CFloor = {6405423.455416104},
+ ARoof = 115.53399999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00048181290290713765},
+ RRoofRem = 0.02400666408811085,
+ CRoof = {2221517.2933001122},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 19.999999999999996,
+ hRadWall = 4.999999999999999,
+ hConWinOut = 19.999999999999996,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.03278688524590164,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 3986.82387685011,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -3986.82387685011,
+ heaLoadFacOut = 120.59455515900831,
+ heaLoadFacGrd = 18.256873108834885,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B2001_retrofit_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_standard_SingleDwelling.mo
new file mode 100644
index 00000000..84ea93a4
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2001_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B2001_standard_SingleDwelling "B2001_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 305.0,
+ AZone = 122.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {8.113, 8.113, 8.113, 8.113},
+ ATransparent = {8.113, 8.113, 8.113, 8.113},
+ hConWin = 2.7,
+ RWin = 0.010979779042083205,
+ gWin = 0.6,
+ UWin= 1.9004689468829972,
+ ratioWinConRad = 0.02,
+ AExt = {31.659000000000002, 31.659000000000002, 31.659000000000002, 31.659000000000002},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.00043913033252628426},
+ RExtRem = 0.022922494899337006,
+ CExt = {22822820.539108664},
+ AInt = 376.16666666666663,
+ hConInt = 2.3756756756756765,
+ nInt = 1,
+ RInt = {0.00017892706852343755},
+ CInt = {43130867.86628312},
+ AFloor = 84.30199999999999,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0014459377148632574},
+ RFloorRem = 0.02444408440989405,
+ CFloor = {9928389.787404006},
+ ARoof = 115.53399999999999,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.00048181290290713765},
+ RRoofRem = 0.02400666408811085,
+ CRoof = {2221517.2933001122},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 19.999999999999996,
+ hRadWall = 4.999999999999999,
+ hConWinOut = 19.999999999999996,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.03278688524590164,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 5425.965613759726,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -5425.965613759726,
+ heaLoadFacOut = 161.6530324987391,
+ heaLoadFacGrd = 36.152653400010735,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B2001_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2009_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2009_standard_SingleDwelling.mo
new file mode 100644
index 00000000..bf1e0e90
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2009_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B2009_standard_SingleDwelling "B2009_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 367.5,
+ AZone = 147.0,
+ hRad = 4.999999999999999,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {7.074375, 7.074375, 7.074375, 7.074375},
+ ATransparent = {7.074375, 7.074375, 7.074375, 7.074375},
+ hConWin = 2.7,
+ RWin = 0.01923440990496384,
+ gWin = 0.6,
+ UWin= 1.4002545917439533,
+ ratioWinConRad = 0.02,
+ AExt = {47.223749999999995, 47.223749999999995, 47.223749999999995, 47.223749999999995},
+ hConExt = 2.7,
+ nExt = 1,
+ RExt = {0.00029439481611370614},
+ RExtRem = 0.015367336690078835,
+ CExt = {34043373.80946121},
+ AInt = 453.25,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.00014849729496502982},
+ CInt = {51969160.46183294},
+ AFloor = 79.82100000000001,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.001540250555924505},
+ RFloorRem = 0.03773464699662736,
+ CFloor = {9316076.326179186},
+ ARoof = 85.89945,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.000706707058806135},
+ RRoofRem = 0.03935753780701612,
+ CRoof = {1675327.8127617438},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.027210884353741496,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {100.0, 100.0, 100.0, 100.0},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 4945.722160398982,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -4945.722160398982,
+ heaLoadFacOut = 149.23722222213283,
+ heaLoadFacGrd = 24.30443561296167,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B2009_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2015_standard_SingleDwelling.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2015_standard_SingleDwelling.mo
new file mode 100644
index 00000000..50dcb913
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/B2015_standard_SingleDwelling.mo
@@ -0,0 +1,93 @@
+within BESMod.Systems.Demand.Building.RecordsCollection.TABULA;
+record B2015_standard_SingleDwelling "B2015_standard_SingleDwelling"
+ extends AixLib.DataBase.ThermalZones.ZoneBaseRecord(
+ T_start = 293.15,
+ withAirCap = true,
+ VAir = 467.5,
+ AZone = 187.0,
+ hRad = 5.0,
+ lat = 0.88645272708792,
+ nOrientations = 4,
+ AWin = {10.50005, 10.50005, 10.50005, 10.50005},
+ ATransparent = {10.50005, 10.50005, 10.50005, 10.50005},
+ hConWin = 2.7,
+ RWin = 0.014267331327726276,
+ gWin = 0.6,
+ UWin= 1.3002195175808904,
+ ratioWinConRad = 0.02,
+ AExt = {56.89475, 56.89475, 56.89475, 56.89475},
+ hConExt = 2.7000000000000006,
+ nExt = 1,
+ RExt = {0.0006818829130825015},
+ RExtRem = 0.016544551455905644,
+ CExt = {60042173.96471376},
+ AInt = 576.5833333333334,
+ hConInt = 2.375675675675676,
+ nInt = 1,
+ RInt = {0.00011673316769978277},
+ CInt = {66110428.61471266},
+ AFloor = 107.79989,
+ hConFloor = 1.7,
+ nFloor = 1,
+ RFloor = {0.0011367854689831015},
+ RFloorRem = 0.025294107102687955,
+ CFloor = {12582669.350797566},
+ ARoof = 131.90045,
+ hConRoof = 1.7,
+ nRoof = 1,
+ RRoof = {0.000653608479842531},
+ RRoofRem = 0.035340347929093505,
+ CRoof = {2735360.4762360607},
+ nOrientationsRoof = 2,
+ tiltRoof = {0.6108652381980153, 0.6108652381980153},
+ aziRoof = {3.141592653589793, -1.5707963267948966},
+ wfRoof = {0.5, 0.5},
+ aRoof = 0.5,
+ aExt = 0.5,
+ TSoil = 286.15,
+ hConWallOut = 20.0,
+ hRadWall = 5.0,
+ hConWinOut = 20.0,
+ hConRoofOut = 20.0,
+ hRadRoof = 5.0,
+ tiltExtWalls = {1.5707963267948966, 1.5707963267948966, 1.5707963267948966, 1.5707963267948966},
+ aziExtWalls = {0.0, 1.5707963267948966, -1.5707963267948966, 3.141592653589793},
+ wfWall = {0.25, 0.25, 0.25, 0.25},
+ wfWin = {0.25, 0.25, 0.25, 0.25},
+ wfGro = 0.0,
+ specificPeople = 0.0213903743315508,
+ internalGainsMoistureNoPeople = 0.5,
+ fixedHeatFlowRatePersons = 70,
+ activityDegree = 1.2,
+ ratioConvectiveHeatPeople = 0.5,
+ internalGainsMachinesSpecific = 2.0,
+ ratioConvectiveHeatMachines = 0.75,
+ lightingPowerSpecific = 7.0,
+ ratioConvectiveHeatLighting = 0.5,
+ useConstantACHrate = false,
+ baseACH = 0.2,
+ maxUserACH = 1.0,
+ maxOverheatingACH = {3.0, 2.0},
+ maxSummerACH = {1.0, 283.15, 290.15},
+ winterReduction = {0.2, 273.15, 283.15},
+ maxIrr = {99.99999999999999, 99.99999999999999, 99.99999999999999, 99.99999999999999},
+ shadingFactor = {1.0, 1.0, 1.0, 1.0},
+ withAHU = false,
+ minAHU = 0.3,
+ maxAHU = 0.6,
+ hHeat = 5675.548541773462,
+ lHeat = 0,
+ KRHeat = 10000,
+ TNHeat = 1,
+ HeaterOn = false,
+ hCool = 0,
+ lCool = -5675.548541773462,
+ heaLoadFacOut = 169.49655385016433,
+ heaLoadFacGrd = 35.95125979545764,
+ KRCool = 10000,
+ TNCool = 1,
+ CoolerOn = false,
+ withIdealThresholds = false,
+ TThresholdHeater = 288.15,
+ TThresholdCooler = 295.15);
+end B2015_standard_SingleDwelling;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.mo b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.mo
new file mode 100644
index 00000000..447e0110
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.mo
@@ -0,0 +1,5 @@
+within BESMod.Systems.Demand.Building.RecordsCollection;
+package TABULA "Typical single family buildings according to tabula"
+ extends Modelica.Icons.RecordsPackage;
+
+end TABULA;
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.order b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.order
new file mode 100644
index 00000000..3451e46a
--- /dev/null
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/TABULA/package.order
@@ -0,0 +1,20 @@
+B2015_standard_SingleDwelling
+B2009_standard_SingleDwelling
+B2001_standard_SingleDwelling
+B1994_standard_SingleDwelling
+B1980_standard_SingleDwelling
+B1970_standard_SingleDwelling
+B1960_standard_SingleDwelling
+B1950_standard_SingleDwelling
+B1948_standard_SingleDwelling
+B1918_standard_SingleDwelling
+B1859_standard_SingleDwelling
+B2001_retrofit_SingleDwelling
+B1994_retrofit_SingleDwelling
+B1980_retrofit_SingleDwelling
+B1970_retrofit_SingleDwelling
+B1960_retrofit_SingleDwelling
+B1950_retrofit_SingleDwelling
+B1859_retrofit_SingleDwelling
+B1918_retrofit_SingleDwelling
+B1948_retrofit_SingleDwelling
diff --git a/BESMod/Systems/Demand/Building/RecordsCollection/package.order b/BESMod/Systems/Demand/Building/RecordsCollection/package.order
index e0e8f0ea..a51e0782 100644
--- a/BESMod/Systems/Demand/Building/RecordsCollection/package.order
+++ b/BESMod/Systems/Demand/Building/RecordsCollection/package.order
@@ -1 +1,3 @@
RefAachen
+TABULA
+ACoolHeadAndBEStPar
diff --git a/BESMod/Systems/Hydraulical/BaseClasses/PartialHydraulicSystem.mo b/BESMod/Systems/Hydraulical/BaseClasses/PartialHydraulicSystem.mo
index 53319a31..7be3578e 100644
--- a/BESMod/Systems/Hydraulical/BaseClasses/PartialHydraulicSystem.mo
+++ b/BESMod/Systems/Hydraulical/BaseClasses/PartialHydraulicSystem.mo
@@ -16,14 +16,18 @@ partial model PartialHydraulicSystem
annotation (choicesAllMatching=true, Placement(transformation(extent={{-178,-136},{-158,-116}})));
replaceable BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration generation(
- dTTra_nominal=fill(1, generation.nParallelDem), dp_nominal=fill(0,
- generation.nParallelDem)) constrainedby
+ dTTra_nominal=fill(1, generation.nParallelDem),
+ dp_nominal=fill(0, generation.nParallelDem)) constrainedby
BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration(
final TDem_nominal=distribution.TSup_nominal,
+ final TDemOld_design=distribution.TSupOld_design,
final Q_flow_nominal={sum(distribution.Q_flow_nominal)*generation.f_design[
i] + distribution.QDHWBefSto_flow_nominal for i in 1:generation.nParallelDem},
+ final QOld_flow_design={sum(distribution.QOld_flow_design)*generation.f_design[
+ i] + distribution.QDHWBefSto_flow_nominal for i in 1:generation.nParallelDem},
redeclare package Medium = Medium,
final dpDem_nominal=distribution.dpSup_nominal,
+ final dpDemOld_design=distribution.dpSupOld_design,
final energyDynamics=energyDynamics,
final massDynamics=massDynamics,
final p_start=p_start,
@@ -122,7 +126,9 @@ partial model PartialHydraulicSystem
final mSenFac=mSenFac,
final TAmb=hydraulicSystemParameters.TAmb,
final Q_flow_nominal=transfer.QSup_flow_nominal,
+ final QOld_flow_design=transfer.QSupOld_flow_design,
final TDem_nominal=transfer.TSup_nominal,
+ final TDemOld_design=transfer.TSupOld_design,
final allowFlowReversal=allowFlowReversal,
final show_T=show_T,
final rho=rho,
@@ -130,7 +136,9 @@ partial model PartialHydraulicSystem
final TOda_nominal=hydraulicSystemParameters.TOda_nominal,
final use_dhw=use_dhw,
final mDem_flow_nominal=transfer.mSup_flow_nominal,
+ final mDemOld_flow_design=transfer.mSupOld_flow_design,
final mSup_flow_nominal=generation.m_flow_nominal,
+ final mSupOld_flow_design=generation.mOld_flow_design,
final mDHW_flow_nominal=hydraulicSystemParameters.mDHW_flow_nominal,
final VDHWDay=hydraulicSystemParameters.VDHWDay,
final QDHW_flow_nominal=hydraulicSystemParameters.QDHW_flow_nominal,
@@ -153,17 +161,20 @@ partial model PartialHydraulicSystem
final X_start=X_start,
final C_start=C_start,
final TTra_nominal=hydraulicSystemParameters.TSup_nominal,
+ final TTraOld_design=hydraulicSystemParameters.TSupOld_design,
final AZone=hydraulicSystemParameters.AZone,
final hZone=hydraulicSystemParameters.hZone,
final ABui=hydraulicSystemParameters.ABui,
final hBui=hydraulicSystemParameters.hBui,
final dpSup_nominal=distribution.dpDem_nominal,
+ final dpSupOld_design=distribution.dpDemOld_design,
final C_nominal=C_nominal,
final mSenFac=mSenFac,
final TOda_nominal=hydraulicSystemParameters.TOda_nominal,
final nParallelDem=hydraulicSystemParameters.nZones,
final TAmb=hydraulicSystemParameters.TAmb,
final Q_flow_nominal=hydraulicSystemParameters.Q_flow_nominal,
+ final QOld_flow_design=hydraulicSystemParameters.QOld_flow_design,
final TDem_nominal=hydraulicSystemParameters.TZone_nominal,
final allowFlowReversal=allowFlowReversal,
final show_T=show_T,
@@ -189,8 +200,8 @@ partial model PartialHydraulicSystem
Medium = MediumDHW) "Outlet for the distribution to the DHW" annotation (
Placement(transformation(extent={{190,-70},{210,-50}}),iconTransformation(
extent={{188,-76},{208,-56}})));
- Modelica.Fluid.Interfaces.FluidPort_a portDHW_in(redeclare final package Medium
- = MediumDHW) "Inet for the distribution from the DHW" annotation (
+ Modelica.Fluid.Interfaces.FluidPort_a portDHW_in(redeclare final package Medium =
+ MediumDHW) "Inet for the distribution from the DHW" annotation (
Placement(transformation(extent={{190,-130},{210,-110}}),
iconTransformation(
extent={{188,-116},{208,-96}})));
diff --git a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialDistribution.mo b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialDistribution.mo
index bbf6fb95..60eedaeb 100644
--- a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialDistribution.mo
+++ b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialDistribution.mo
@@ -4,7 +4,8 @@ partial model PartialDistribution
extends BESMod.Utilities.Icons.StorageIcon;
extends BESMod.Systems.BaseClasses.PartialFluidSubsystemWithParameters(final
dp_nominal=dpDem_nominal,
- TSup_nominal=TDem_nominal .+ dTLoss_nominal .+ dTTra_nominal);
+ TSup_nominal=TDem_nominal .+ dTLoss_nominal .+ dTTra_nominal,
+ TSupOld_design=TDemOld_design .+ dTLoss_nominal .+ dTTraOld_design);
extends PartialDHWParameters;
replaceable package MediumDHW =
Modelica.Media.Interfaces.PartialMedium
@@ -16,26 +17,40 @@ partial model PartialDistribution
parameter Boolean use_dhw=true "=false to disable DHW";
parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal[nParallelSup](each min=Modelica.Constants.eps)
"Nominal mass flow rate of system supplying the distribution" annotation (
- Dialog(group=
- "Design - Top Down: Parameters are given by the parent system"));
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.MassFlowRate mSupOld_flow_design[nParallelSup](each min=Modelica.Constants.eps) = mSup_flow_nominal
+ "Old design mass flow rate of system supplying the distribution" annotation (
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.MassFlowRate mSup_flow_design[nParallelSup](each min=Modelica.Constants.eps) = mSup_flow_nominal
+ "Design mass flow rate of system supplying the distribution" annotation (
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.MassFlowRate mDem_flow_nominal[nParallelDem](each min=Modelica.Constants.eps)
"Nominal mass flow rate of demand system of the distribution" annotation (
- Dialog(group=
- "Design - Top Down: Parameters are given by the parent system"));
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.MassFlowRate mDemOld_flow_design[nParallelDem](each min=Modelica.Constants.eps) = mDem_flow_nominal
+ "Old design mass flow rate of demand system of the distribution" annotation (
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.MassFlowRate mDem_flow_design[nParallelDem](each min=Modelica.Constants.eps) = mDem_flow_nominal
+ "Design mass flow rate of demand system of the distribution" annotation (
+ Dialog(group="Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.TemperatureDifference dTTraDHW_nominal
"Nominal temperature difference to transfer heat to the DHW storage"
annotation (Dialog(group="DHW Demand"));
parameter Modelica.Units.SI.PressureDifference dpSup_nominal[nParallelSup]
"Nominal pressure loss of resistances connected to the supply system of the distribution"
- annotation (Dialog(group=
- "Design - Bottom Up: Parameters are defined by the subsystem"));
+ annotation (Dialog(group="Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.PressureDifference dpSupOld_design[nParallelSup]=dpSup_nominal
+ "Old design pressure loss of resistances connected to the supply system of the distribution"
+ annotation (Dialog(group="Design - Bottom Up: Parameters are defined by the subsystem"));
parameter Modelica.Units.SI.PressureDifference dpDem_nominal[nParallelDem]
"Nominal pressure loss of resistances connected to the demand system of the distribution"
- annotation (Dialog(group=
- "Design - Bottom Up: Parameters are defined by the subsystem"));
+ annotation (Dialog(group="Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.PressureDifference dpDemOld_design[nParallelDem] = dpDem_nominal
+ "Old design pressure loss of resistances connected to the demand system of the distribution"
+ annotation (Dialog(group="Design - Bottom Up: Parameters are defined by the subsystem"));
- Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelSup](redeclare final
- package Medium = MediumGen) "Inlet from the generation" annotation (
+ Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelSup](redeclare
+ final package Medium = MediumGen) "Inlet from the generation" annotation (
Placement(transformation(extent={{-110,70},{-90,90}}), iconTransformation(
extent={{-110,70},{-90,90}})));
Modelica.Fluid.Interfaces.FluidPort_b portGen_out[nParallelSup](redeclare
@@ -47,8 +62,8 @@ partial model PartialDistribution
Medium) "Outlet for the distribution to the building"
annotation (Placement(transformation(extent={{90,70},{110,90}}),
iconTransformation(extent={{90,70},{110,90}})));
- Modelica.Fluid.Interfaces.FluidPort_a portBui_in[nParallelDem](redeclare final
- package Medium =
+ Modelica.Fluid.Interfaces.FluidPort_a portBui_in[nParallelDem](redeclare
+ final package Medium =
Medium) "Inlet for the distribution from the building"
annotation (Placement(transformation(extent={{90,30},{110,50}}),
iconTransformation(extent={{90,30},{110,50}})));
diff --git a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo
index 2b8a1a4c..ec01bf6b 100644
--- a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo
+++ b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo
@@ -1,7 +1,15 @@
within BESMod.Systems.Hydraulical.Distribution.BaseClasses;
partial model PartialTwoStorageParallel "Partial model to later extent"
extends BaseClasses.PartialDistribution(
- final dpDHW_nominal=0,
+ Q_flow_design={if use_old_design[i] then QOld_flow_design[i] else
+ Q_flow_nominal[i] for i in 1:nParallelDem},
+ m_flow_design={if use_old_design[i] then mOld_flow_design[i] else
+ m_flow_nominal[i] for i in 1:nParallelDem},
+ mSup_flow_design={if use_old_design[i] then mSupOld_flow_design[i] else
+ mSup_flow_nominal[i] for i in 1:nParallelSup},
+ mDem_flow_design={if use_old_design[i] then mDemOld_flow_design[i] else
+ mDem_flow_nominal[i] for i in 1:nParallelDem},
+ final mOld_flow_design=mDemOld_flow_design,
final dpDem_nominal={0},
final dpSup_nominal={parThrWayVal.dpValve_nominal + max(parThrWayVal.dp_nominal)},
final dTTraDHW_nominal=parStoDHW.dTLoadingHC1,
@@ -14,6 +22,10 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
final nParallelSup=1,
final nParallelDem=1);
+ parameter Boolean use_old_design[nParallelDem]=fill(false, nParallelDem)
+ "If true, design parameters of the building with no retrofit (old state) are used"
+ annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
+
parameter Modelica.Units.SI.TemperatureDifference dTLoaHCBuf
"Temperature difference for loading of heating coil in buffer storage"
annotation(Dialog(group="Component data"));
@@ -31,7 +43,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
replaceable parameter BESMod.Systems.RecordsCollection.Valves.ThreeWayValve parThrWayVal
constrainedby BESMod.Systems.RecordsCollection.Valves.ThreeWayValve(
final dp_nominal={dpBufHCSto_nominal,dpDHWHCSto_nominal},
- final m_flow_nominal=mSup_flow_nominal[1],
+ final m_flow_nominal=mSup_flow_design[1],
final fraK=1,
use_inputFilter=false) "Parameters for three way valve" annotation (
Dialog(group="Component data"),
@@ -41,14 +53,14 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
replaceable parameter
RecordsCollection.BufferStorage.BufferStorageBaseDataDefinition parStoBuf
constrainedby RecordsCollection.BufferStorage.BufferStorageBaseDataDefinition(
- final Q_flow_nominal=Q_flow_nominal[1]*f_design[1],
+ final Q_flow_nominal=Q_flow_design[1]*f_design[1],
final rho=rho,
final c_p=cp,
final dTLoadingHC1=dTLoaHCBuf,
final TAmb=TAmb,
T_m=TSup_nominal[1],
- final QHC1_flow_nominal=Q_flow_nominal[1]*f_design[1],
- final mHC1_flow_nominal=mSup_flow_nominal[1],
+ final QHC1_flow_nominal=Q_flow_design[1]*f_design[1],
+ final mHC1_flow_nominal=mSup_flow_design[1],
final use_HC2=stoBuf.useHeatingCoil2,
final use_HC1=stoBuf.useHeatingCoil1,
final dTLoadingHC2=9999999,
@@ -74,7 +86,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
final TAmb=TAmb,
T_m=TDHW_nominal,
final QHC1_flow_nominal=QDHW_flow_nominal,
- final mHC1_flow_nominal=mSup_flow_nominal[1],
+ final mHC1_flow_nominal=mSup_flow_design[1],
final use_HC2=stoDHW.useHeatingCoil2,
final use_HC1=stoDHW.useHeatingCoil1,
final dTLoadingHC2=dTLoadingHC2,
@@ -137,8 +149,8 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
final mSenFac=1,
redeclare package MediumHC1 = MediumGen,
redeclare package MediumHC2 = MediumGen,
- final m1_flow_nominal=mSup_flow_nominal[1],
- final m2_flow_nominal=m_flow_nominal[1],
+ final m1_flow_nominal=mSup_flow_design[1],
+ final m2_flow_nominal=m_flow_design[1],
final mHC1_flow_nominal=parStoBuf.mHC1_flow_nominal,
final mHC2_flow_nominal=parStoBuf.mHC2_flow_nominal,
final useHeatingCoil2=false,
@@ -191,7 +203,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
final mSenFac=1,
redeclare final package MediumHC1 = MediumGen,
redeclare final package MediumHC2 = MediumGen,
- final m1_flow_nominal=mSup_flow_nominal[1],
+ final m1_flow_nominal=mSup_flow_design[1],
final m2_flow_nominal=mDHW_flow_nominal,
final mHC1_flow_nominal=parStoDHW.mHC1_flow_nominal,
final mHC2_flow_nominal=parStoDHW.mHC2_flow_nominal,
diff --git a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo
index 5e7bf495..f3b8668c 100644
--- a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo
+++ b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo
@@ -36,8 +36,8 @@ partial model PartialTwoStorageParallelWithHeaters
BESMod.Systems.Hydraulical.Components.ElectricHeaterWithSecurityControl hea(
redeclare package Medium = Medium,
final allowFlowReversal=allowFlowReversal,
- final m_flow_nominal=m_flow_nominal[1],
- final m_flow_small=1E-4*abs(m_flow_nominal[1]),
+ final m_flow_nominal=m_flow_design[1],
+ final m_flow_small=1E-4*abs(m_flow_design[1]),
final show_T=show_T,
final dp_nominal=parEleHeaAftBuf.dp_nominal,
final tau=30,
@@ -67,8 +67,8 @@ partial model PartialTwoStorageParallelWithHeaters
AixLib.Fluid.BoilerCHP.BoilerNoControl boi(
redeclare package Medium = AixLib.Media.Water,
final allowFlowReversal=true,
- final m_flow_nominal=m_flow_nominal[1],
- final m_flow_small=1E-4*abs(m_flow_nominal[1]),
+ final m_flow_nominal=m_flow_design[1],
+ final m_flow_small=1E-4*abs(m_flow_design[1]),
final show_T=show_T,
final tau=parTemSen.tau,
final initType=parTemSen.initType,
diff --git a/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo b/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo
index fffd361f..4cf3504c 100644
--- a/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo
+++ b/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo
@@ -13,6 +13,8 @@ model CombiStorage
dTTra_nominal={0},
final TSup_nominal=fill(TDem_nominal[1] .+ dTLoss_nominal[1] .+
dTTra_nominal[1], nParallelSup),
+ final TSupOld_design=fill(TDemOld_design[1] .+ dTLoss_nominal[1] .+
+ dTTraOld_design[1], nParallelSup),
final nParallelSup=2,
final nParallelDem=1);
diff --git a/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo b/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo
index 1ae76ff9..00a23469 100644
--- a/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo
+++ b/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo
@@ -10,7 +10,8 @@ model TwoStoragesBoilerWithDHW
final dpBufHCSto_nominal=0,
final dTLoaHCBuf=0,
final use_secHeaCoiDHWSto=true,
- stoDHW(nHC2Up=parStoDHW.nLayer, nHC2Low=1));
+ stoDHW(nHC2Up=parStoDHW.nLayer, nHC2Low=1),
+ final use_old_design=fill(false, nParallelDem));
parameter Modelica.Units.SI.TemperatureDifference dTBoiDHWLoa = 5
"Temperature difference for DHW storage loading with the boiler"
annotation(Dialog(group="Component data"));
diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialGeneration.mo b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialGeneration.mo
index f994265d..359b126b 100644
--- a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialGeneration.mo
+++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialGeneration.mo
@@ -3,13 +3,20 @@ partial model PartialGeneration "Partial generation model for HPS"
extends BESMod.Utilities.Icons.GenerationIcon;
extends BESMod.Systems.BaseClasses.PartialFluidSubsystemWithParameters(
final TSup_nominal=TDem_nominal .+ dTLoss_nominal,
- m_flow_nominal=Q_flow_nominal .* f_design ./ dTTra_nominal ./ 4184, final
- nParallelSup=nParallelDem);
+ final TSupOld_design=TDemOld_design .+ dTLoss_nominal,
+ m_flow_nominal=Q_flow_nominal .* f_design ./ dTTra_nominal ./ 4184,
+ m_flow_design=Q_flow_design .* f_design ./ dTTra_design ./ 4184,
+ mOld_flow_design=QOld_flow_design .* f_design ./ dTTraOld_design ./ 4184,
+ final nParallelSup=nParallelDem);
parameter Modelica.Units.SI.PressureDifference dpDem_nominal[nParallelDem]
"Nominal pressure loss of resistances in the demand system of the generation"
annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.PressureDifference dpDemOld_design[nParallelDem]
+ "Nominal design pressure loss of resistances in the old demand system of the generation"
+ annotation (Dialog(group=
+ "Design - Top Down: Parameters are given by the parent system"));
BESMod.Systems.Hydraulical.Interfaces.GenerationControlBus
sigBusGen
@@ -18,8 +25,8 @@ partial model PartialGeneration "Partial generation model for HPS"
final package Medium = Medium) "Outlet of the generation" annotation (
Placement(transformation(extent={{90,70},{110,90}}), iconTransformation(
extent={{90,70},{110,90}})));
- Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelDem](redeclare final
- package Medium = Medium) "Inlet to the generation" annotation (
+ Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelDem](redeclare
+ final package Medium = Medium) "Inlet to the generation" annotation (
Placement(transformation(extent={{90,-12},{110,8}}), iconTransformation(
extent={{90,30},{110,50}})));
BESMod.Systems.Hydraulical.Interfaces.GenerationOutputs
diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo
index 83456436..b07cc038 100644
--- a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo
+++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo
@@ -3,10 +3,19 @@ model PartialHeatPump "Generation with only the heat pump"
extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration(
final QLoss_flow_nominal=f_design .* Q_flow_nominal .- Q_flow_nominal,
final dTLoss_nominal=fill(0, nParallelDem),
+ Q_flow_design = {if use_old_design[i] then QOld_flow_design[i] else Q_flow_nominal[i] for i in 1:nParallelDem},
dTTra_nominal={if TDem_nominal[i] > 273.15 + 55 then 10 elseif TDem_nominal[
i] > 44.9 + 273.15 then 8 else 5 for i in 1:nParallelDem},
+ dTTraOld_design={if TDemOld_design[i] > 273.15 + 55 then 10 elseif TDemOld_design[
+ i] > 44.9 + 273.15 then 8 else 5 for i in 1:nParallelDem},
+ dTTra_design={if use_old_design[i] then dTTraOld_design[i] else dTTra_nominal[i] for i in 1:nParallelDem},
dp_nominal={heatPump.dpCon_nominal},
nParallelDem=1);
+
+ parameter Boolean use_old_design[nParallelDem]=fill(false, nParallelDem)
+ "If true, design parameters of the building with no retrofit (old state) are used"
+ annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
+
replaceable model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D
constrainedby
@@ -44,7 +53,7 @@ model PartialHeatPump "Generation with only the heat pump"
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumpBaseDataDefinition
parHeaPum constrainedby
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumpBaseDataDefinition(
- final QGen_flow_nominal=Q_flow_nominal[1], final TOda_nominal=TOda_nominal)
+ final QGen_flow_nominal=Q_flow_design[1], final TOda_nominal=TOda_nominal)
"Heat pump parameters" annotation (
Dialog(group="Component data"),
choicesAllMatching=true,
@@ -75,7 +84,7 @@ model PartialHeatPump "Generation with only the heat pump"
final refIneFre_constant=parHeaPum.refIneFre_constant,
final nthOrder=1,
final useBusConnectorOnly=false,
- final mFlow_conNominal=m_flow_nominal[1],
+ final mFlow_conNominal=m_flow_design[1],
final VCon=parHeaPum.VCon,
final dpCon_nominal=parHeaPum.dpCon_nominal,
final use_conCap=false,
@@ -145,7 +154,7 @@ model PartialHeatPump "Generation with only the heat pump"
final T_start=T_start,
final allowFlowReversal=allowFlowReversal,
final show_T=show_T,
- final m_flow_nominal=m_flow_nominal[1],
+ final m_flow_nominal=m_flow_design[1],
final dp_nominal=dpDem_nominal[1] + dp_nominal[1],
final addPowerToMedium=parPum.addPowerToMedium,
final tau=parPum.tau,
diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo
index 90cd5f6b..1fbc7246 100644
--- a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo
+++ b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo
@@ -10,8 +10,8 @@ model HeatPumpAndElectricHeater "Heat pump with an electric heater in series"
AixLib.Fluid.HeatExchangers.HeatingRod eleHea(
redeclare package Medium = Medium,
final allowFlowReversal=allowFlowReversal,
- final m_flow_nominal=m_flow_nominal[1],
- final m_flow_small=1E-4*abs(m_flow_nominal[1]),
+ final m_flow_nominal=m_flow_design[1],
+ final m_flow_small=1E-4*abs(m_flow_design[1]),
final show_T=show_T,
final dp_nominal=parEleHea.dp_nominal,
final tau=30,
diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerParallel.mo b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerParallel.mo
index e46b3e06..12c74d76 100644
--- a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerParallel.mo
+++ b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerParallel.mo
@@ -1,7 +1,8 @@
within BESMod.Systems.Hydraulical.Generation;
model HeatPumpAndGasBoilerParallel
"Parallel connection of heat pump and gas boiler"
- extends BaseClasses.PartialHeatPumpAndGasBoiler;
+ extends BaseClasses.PartialHeatPumpAndGasBoiler(
+ final use_old_design=fill(false, nParallelDem));
replaceable parameter BESMod.Systems.RecordsCollection.Valves.ThreeWayValve
parThrWayVal constrainedby
diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo
index 244d1401..aa5e60a4 100644
--- a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo
+++ b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo
@@ -1,6 +1,7 @@
within BESMod.Systems.Hydraulical.Generation;
model HeatPumpAndGasBoilerSerial "serial arrangement of heatpump and boiler"
- extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPumpAndGasBoiler;
+ extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPumpAndGasBoiler(
+ final use_old_design=fill(false, nParallelDem));
equation
diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo b/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo
index bf03cb07..fb07a70c 100644
--- a/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo
+++ b/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo
@@ -7,17 +7,19 @@ partial model PartialTest
genControlBus
annotation (Placement(transformation(extent={{-10,54},{30,94}})));
replaceable BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration generation
- constrainedby
- BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration(
+ constrainedby BaseClasses.PartialGeneration(
redeclare package Medium = IBPSA.Media.Water,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
dTTra_nominal=fill(10, generation.nParallelDem),
m_flow_nominal=fill(0.317, generation.nParallelDem),
Q_flow_nominal=fill(sum(systemParameters.QBui_flow_nominal), generation.nParallelDem),
+
TOda_nominal=systemParameters.TOda_nominal,
dpDem_nominal=fill(0, generation.nParallelDem),
TDem_nominal=fill(systemParameters.THydSup_nominal[1], generation.nParallelDem),
- TAmb=systemParameters.TAmbHyd)
+
+ TAmb=systemParameters.TAmbHyd,
+ dpDemOld_design=fill(0, generation.nParallelDem))
annotation (choicesAllMatching=true, Placement(transformation(extent={{-50,-44},{24,28}})));
IBPSA.Fluid.MixingVolumes.MixingVolume vol[generation.nParallelDem](
redeclare final package Medium = IBPSA.Media.Water,
diff --git a/BESMod/Systems/Hydraulical/Transfer/BaseClasses/PartialTransfer.mo b/BESMod/Systems/Hydraulical/Transfer/BaseClasses/PartialTransfer.mo
index ee5304c3..228e3cad 100644
--- a/BESMod/Systems/Hydraulical/Transfer/BaseClasses/PartialTransfer.mo
+++ b/BESMod/Systems/Hydraulical/Transfer/BaseClasses/PartialTransfer.mo
@@ -3,25 +3,50 @@ partial model PartialTransfer "Partial transfer model for BES"
extends BESMod.Utilities.Icons.TransferIcon;
extends BESMod.Systems.BaseClasses.PartialFluidSubsystemWithParameters(
TSup_nominal=fill(max(TTra_nominal),nParallelSup),
+ TSupOld_design=fill(max(TTraOld_design),nParallelSup),
dTTra_nominal={if TTra_nominal[i] > 64.9 + 273.15 then 15 elseif
TTra_nominal[i] > 44.9 + 273.15 then 10 else 7 for i in 1:nParallelDem},
- m_flow_nominal=Q_flow_nominal ./ (dTTra_nominal .* 4184));
+ m_flow_nominal=Q_flow_nominal ./ (dTTra_nominal .* 4184),
+ mOld_flow_design=QOld_flow_design ./ (dTTraOld_design .* 4184),
+ dTTra_design={if TTra_design[i] > 64.9 + 273.15 then 15 elseif
+ TTra_design[i] > 44.9 + 273.15 then 10 else 7 for i in 1:nParallelDem},
+ dTTraOld_design={if TTraOld_design[i] > 64.9 + 273.15 then 15 elseif
+ TTraOld_design[i] > 44.9 + 273.15 then 10 else 7 for i in 1:nParallelDem},
+ m_flow_design=Q_flow_design ./ (dTTra_design .* 4184));
parameter Modelica.Units.SI.HeatFlowRate QSup_flow_nominal[nParallelSup]=fill(sum(
Q_flow_nominal .* f_design), nParallelSup)
"Nominal heat flow rate at supply ports to transfer system" annotation (Dialog(group=
"Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.HeatFlowRate QSupOld_flow_design[nParallelSup]=fill(sum(
+ QOld_flow_design .* f_design), nParallelSup)
+ "Old design heat flow rate at supply ports to transfer system" annotation (Dialog(group=
+ "Design - Bottom Up: Parameters are defined by the subsystem"));
+
parameter Modelica.Units.SI.Temperature TTra_nominal[nParallelDem] "Nominal supply temperature to transfer systems"
annotation(Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.Temperature TTraOld_design[nParallelDem] "Old design nominal supply temperature to transfer systems"
+ annotation(Dialog(group="Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.Temperature TTra_design[nParallelDem]=TTra_nominal
+ "Nominal design supply temperature to transfer systems"
+ annotation(Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal[nParallelSup]=fill(sum(
m_flow_nominal), nParallelSup)
"Nominal mass flow rate of the supply ports to the transfer system" annotation (Dialog(
group="Design - Bottom Up: Parameters are defined by the subsystem"));
+ parameter Modelica.Units.SI.MassFlowRate mSupOld_flow_design[nParallelSup]=fill(sum(
+ mOld_flow_design), nParallelSup)
+ "Old design mass flow rate of the supply ports to the transfer system" annotation (Dialog(
+ group="Design - Bottom Up: Parameters are defined by the subsystem"));
parameter Modelica.Units.SI.PressureDifference dpSup_nominal[nParallelSup]
"Nominal pressure loss of resistances in the supply system of the distribution"
annotation (Dialog(group=
"Design - Top Down: Parameters are given by the parent system"));
+ parameter Modelica.Units.SI.PressureDifference dpSupOld_design[nParallelSup]
+ "Old design pressure loss of resistances in the supply system of the distribution"
+ annotation (Dialog(group=
+ "Design - Top Down: Parameters are given by the parent system"));
parameter Modelica.Units.SI.Area AZone[nParallelDem](each min=0.1)
"Area of zones/rooms"
@@ -46,8 +71,8 @@ partial model PartialTransfer "Partial transfer model for BES"
final package Medium = Medium) "Outlet of the transfer system"
annotation (Placement(transformation(extent={{-110,-52},{-90,-32}}),
iconTransformation(extent={{-110,-52},{-90,-32}})));
- Modelica.Fluid.Interfaces.FluidPort_a portTra_in[nParallelSup](redeclare final
- package Medium = Medium) "Inlet to the transfer system" annotation (
+ Modelica.Fluid.Interfaces.FluidPort_a portTra_in[nParallelSup](redeclare
+ final package Medium = Medium) "Inlet to the transfer system" annotation (
Placement(transformation(extent={{-110,28},{-90,48}}), iconTransformation(
extent={{-110,30},{-90,50}})));
Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPortRad[nParallelDem]
diff --git a/BESMod/Systems/Hydraulical/Transfer/IdealValveRadiator.mo b/BESMod/Systems/Hydraulical/Transfer/IdealValveRadiator.mo
index e5fc4837..1cf8cb50 100644
--- a/BESMod/Systems/Hydraulical/Transfer/IdealValveRadiator.mo
+++ b/BESMod/Systems/Hydraulical/Transfer/IdealValveRadiator.mo
@@ -6,24 +6,30 @@ model IdealValveRadiator
final QLoss_flow_nominal=f_design .* Q_flow_nominal .- Q_flow_nominal,
final dTLoss_nominal=fill(0, nParallelDem),
final nParallelSup=1,
- final dp_nominal=parTra.dp_nominal);
+ final dp_nominal=parTra.dp_nominal,
+ Q_flow_design={if use_oldRad_design[i] then QOld_flow_design[i] else Q_flow_nominal[i] for i in 1:nParallelDem},
+ TTra_design={if use_oldRad_design[i] then TTraOld_design[i] else TTra_nominal[i] for i in 1:nParallelDem});
+
+ parameter Boolean use_oldRad_design[nParallelDem]=fill(false, nParallelDem)
+ "If true, radiator design of old building state is used"
+ annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
IBPSA.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad[nParallelDem](
each final allowFlowReversal=allowFlowReversal,
- final m_flow_nominal=m_flow_nominal,
+ final m_flow_nominal=m_flow_design,
each final show_T=show_T,
each final energyDynamics=energyDynamics,
each final p_start=p_start,
each final nEle=parRad.nEle,
each final fraRad=parRad.fraRad,
- final Q_flow_nominal=Q_flow_nominal .* f_design,
- final T_a_nominal=TTra_nominal,
- final T_b_nominal=TTra_nominal - dTTra_nominal,
+ final Q_flow_nominal=Q_flow_design .* f_design,
+ final T_a_nominal=TTra_design,
+ final T_b_nominal=TTra_design - dTTra_design,
final TAir_nominal=TDem_nominal,
final TRad_nominal=TDem_nominal,
each final n=parRad.n,
each final deltaM=0.3,
- final dp_nominal=parTra.dpRad_nominal,
+ each final dp_nominal=0,
redeclare package Medium = Medium,
each final T_start=T_start) "Radiator" annotation (Placement(transformation(
extent={{10,10},{-10,-10}},
@@ -32,8 +38,9 @@ model IdealValveRadiator
IBPSA.Fluid.FixedResistances.PressureDrop res[nParallelDem](
redeclare package Medium = Medium,
- each final dp_nominal=parTra.dpHeaDistr_nominal,
- final m_flow_nominal=m_flow_nominal) "Hydraulic resistance of supply"
+ each final dp_nominal=parTra.dpHeaDistr_nominal+parTra.dpRad_nominal[1],
+ final m_flow_nominal=m_flow_nominal)
+ "Hydraulic resistance of supply and radiator to set dp allways to m_flow_nominal"
annotation (Placement(transformation(
extent={{-10,-10},{10,10}},
rotation=0,
@@ -83,7 +90,7 @@ model IdealValveRadiator
origin={0,70})));
replaceable parameter RecordsCollection.TransferDataBaseDefinition parTra
constrainedby RecordsCollection.TransferDataBaseDefinition(
- final Q_flow_nominal=Q_flow_nominal .* f_design,
+ final Q_flow_nominal=Q_flow_design .* f_design,
final nZones=nParallelDem,
final AFloor=ABui,
final heiBui=hBui,
diff --git a/BESMod/Systems/Hydraulical/Transfer/RadiatorPressureBased.mo b/BESMod/Systems/Hydraulical/Transfer/RadiatorPressureBased.mo
index 112b2d6c..0f16aa26 100644
--- a/BESMod/Systems/Hydraulical/Transfer/RadiatorPressureBased.mo
+++ b/BESMod/Systems/Hydraulical/Transfer/RadiatorPressureBased.mo
@@ -6,7 +6,14 @@ model RadiatorPressureBased "Pressure Based transfer system"
ABui=1,
hBui=1,
final dp_nominal=parTra.dp_nominal,
- final nParallelSup=1);
+ final nParallelSup=1,
+ Q_flow_design={if use_oldRad_design[i] then QOld_flow_design[i] else Q_flow_nominal[i] for i in 1:nParallelDem},
+ TTra_design={if use_oldRad_design[i] then TTraOld_design[i] else TTra_nominal[i] for i in 1:nParallelDem});
+
+ parameter Boolean use_oldRad_design[nParallelDem]=fill(false, nParallelDem)
+ "If true, radiator design of the building with no retrofit (old state) is used"
+ annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
+
parameter Boolean use_preRelVal=false "=false to disable pressure relief valve"
annotation(Dialog(group="Component choices"));
parameter Real perPreRelValOpens=0.99
@@ -14,12 +21,11 @@ model RadiatorPressureBased "Pressure Based transfer system"
annotation(Dialog(group="Component choices", enable=use_preRelVal));
replaceable parameter RecordsCollection.TransferDataBaseDefinition parTra
constrainedby RecordsCollection.TransferDataBaseDefinition(
- final Q_flow_nominal=Q_flow_nominal .* f_design,
+ final Q_flow_nominal=Q_flow_design .* f_design,
final nZones=nParallelDem,
final AFloor=ABui,
final heiBui=hBui,
- mRad_flow_nominal=m_flow_nominal,
- mHeaCir_flow_nominal=mSup_flow_nominal[1]) "Transfer parameters" annotation (
+ mRad_flow_nominal=m_flow_nominal) "Transfer parameters" annotation (
Dialog(group="Component data"),
choicesAllMatching=true,
Placement(transformation(extent={{-62,-98},{-42,-78}})));
@@ -36,20 +42,20 @@ model RadiatorPressureBased "Pressure Based transfer system"
Placement(transformation(extent={{-100,-98},{-80,-78}})));
IBPSA.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad[nParallelDem](
each final allowFlowReversal=allowFlowReversal,
- final m_flow_nominal=m_flow_nominal,
+ final m_flow_nominal=m_flow_design,
each final show_T=show_T,
each final energyDynamics=energyDynamics,
each final p_start=p_start,
each final nEle=parRad.nEle,
each final fraRad=parRad.fraRad,
- final Q_flow_nominal=Q_flow_nominal .* f_design,
- final T_a_nominal=TTra_nominal,
- final T_b_nominal=TTra_nominal .- dTTra_nominal,
+ final Q_flow_nominal=Q_flow_design .* f_design,
+ final T_a_nominal=TTra_design,
+ final T_b_nominal=TTra_design .- dTTra_design,
final TAir_nominal=TDem_nominal,
final TRad_nominal=TDem_nominal,
each final n=parRad.n,
each final deltaM=0.3,
- final dp_nominal=parTra.dpRad_nominal,
+ each final dp_nominal=0,
redeclare package Medium = Medium,
each final T_start=T_start) "Radiator" annotation (Placement(transformation(
extent={{11,11},{-11,-11}},
@@ -58,8 +64,9 @@ model RadiatorPressureBased "Pressure Based transfer system"
IBPSA.Fluid.FixedResistances.PressureDrop res[nParallelDem](
redeclare package Medium = Medium,
- each final dp_nominal=parTra.dpHeaDistr_nominal,
- final m_flow_nominal=m_flow_nominal) "Hydraulic resistance of supply"
+ each final dp_nominal=parTra.dpHeaDistr_nominal+parTra.dpRad_nominal[1],
+ final m_flow_nominal=m_flow_nominal)
+ "Hydraulic resistance of supply and radiator to set dp allways to m_flow_nominal"
annotation (Placement(transformation(
extent={{-12.5,-13.5},{12.5,13.5}},
rotation=0,
diff --git a/BESMod/Systems/Hydraulical/Transfer/Tests/PartialTest.mo b/BESMod/Systems/Hydraulical/Transfer/Tests/PartialTest.mo
index 484cf9cc..2265d89e 100644
--- a/BESMod/Systems/Hydraulical/Transfer/Tests/PartialTest.mo
+++ b/BESMod/Systems/Hydraulical/Transfer/Tests/PartialTest.mo
@@ -13,7 +13,9 @@ partial model PartialTest
TDem_nominal=systemParameters.TSetZone_nominal,
TAmb=systemParameters.TAmbHyd,
TTra_nominal=systemParameters.THydSup_nominal,
+ TTraOld_design=systemParameters.THydSup_nominal,
dpSup_nominal=fill(0, transfer.nParallelDem),
+ dpSupOld_design=fill(0, transfer.nParallelDem),
AZone={100},
hZone={2.6},
ABui=100,
diff --git a/BESMod/Systems/RecordsCollection/SupplySystemBaseDataDefinition.mo b/BESMod/Systems/RecordsCollection/SupplySystemBaseDataDefinition.mo
index ca91f15f..e51bdafb 100644
--- a/BESMod/Systems/RecordsCollection/SupplySystemBaseDataDefinition.mo
+++ b/BESMod/Systems/RecordsCollection/SupplySystemBaseDataDefinition.mo
@@ -5,12 +5,16 @@ record SupplySystemBaseDataDefinition
parameter Integer nZones(min=1) "Number of zones supplied by hydraulic system" annotation (Dialog(group="Building"));
parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal[nZones]
"Nominal heat demand of each zone" annotation (Dialog(group="Building"));
+ parameter Modelica.Units.SI.HeatFlowRate QOld_flow_design[nZones]=Q_flow_nominal
+ "Nominal design heat demand of each zone of the building with no retrofit (old state)" annotation (Dialog(group="Building"));
parameter Modelica.Units.SI.Temperature TOda_nominal
"Nominal outdoor air temperature"
annotation (Dialog(group="Temperature levels"));
parameter Modelica.Units.SI.Temperature TSup_nominal[nZones]
"Nominal supply temperature" annotation (Dialog(group="Temperatur levels"));
+ parameter Modelica.Units.SI.Temperature TSupOld_design[nZones]=TSup_nominal
+ "Design supply temperature of the building with no retrofit (old state)" annotation (Dialog(group="Temperatur levels"));
parameter Modelica.Units.SI.Temperature TZone_nominal[nZones]
"Nominal supply temperature" annotation (Dialog(group="Temperatur levels"));
parameter Modelica.Units.SI.Temperature TAmb
diff --git a/BESMod/Systems/RecordsCollection/SystemParametersBaseDataDefinition.mo b/BESMod/Systems/RecordsCollection/SystemParametersBaseDataDefinition.mo
index 7594bc61..3b9f7b87 100644
--- a/BESMod/Systems/RecordsCollection/SystemParametersBaseDataDefinition.mo
+++ b/BESMod/Systems/RecordsCollection/SystemParametersBaseDataDefinition.mo
@@ -5,8 +5,7 @@ record SystemParametersBaseDataDefinition
// Heat demand levels
parameter Integer nZones=1 "Number of zones to transfer heat to" annotation(Dialog(group="Heat demand"));
- parameter Modelica.Units.SI.HeatFlowRate QBui_flow_nominal[nZones]=fill(
- 9710.1, nZones)
+ parameter Modelica.Units.SI.HeatFlowRate QBui_flow_nominal[nZones]=fill(0, nZones)
"Nominal heating load at outdoor air temperature of each zone"
annotation (Dialog(group="Heat demand"));
@@ -65,6 +64,17 @@ record SystemParametersBaseDataDefinition
parameter Boolean use_ventilation=true "=false to disable ventilation subsystem" annotation(Dialog(group="System layout"));
parameter Boolean use_dhw=use_hydraulic "=false to disable DHW subsystem" annotation(Dialog(group="System layout", enable=use_hydraulic));
parameter Boolean use_elecHeating=true "= false to disable heating using the electric system" annotation(Dialog(group="System layout"));
+
+ parameter Modelica.Units.SI.HeatFlowRate QBuiOld_flow_design[nZones]=QBui_flow_nominal
+ "Nominal design heating load at outdoor air temperature of each zone in the old builing state"
+ annotation (Dialog(group="Old / before retrofit"));
+ parameter Modelica.Units.SI.Temperature THydSupOld_design[nZones](
+ each min=233.15,
+ each max=373.15,
+ each start=313.15) = THydSup_nominal
+ "Hydraulic supply temperature at design condition in the transfer system in the old builing state"
+ annotation (Dialog(group="Old / before retrofit"));
+
annotation (defaultComponentName = "baseParameterAssumptions", Icon(graphics,
coordinateSystem(preserveAspectRatio=false)), Diagram(graphics,
coordinateSystem(preserveAspectRatio=false)));
diff --git a/BESMod/UsersGuide/GettingStarted/Parameterization.mo b/BESMod/UsersGuide/GettingStarted/Parameterization.mo
new file mode 100644
index 00000000..4a34353c
--- /dev/null
+++ b/BESMod/UsersGuide/GettingStarted/Parameterization.mo
@@ -0,0 +1,145 @@
+within BESMod.UsersGuide.GettingStarted;
+model Parameterization "Parameterization"
+
+ annotation(Documentation(info="
+ The parameterization in BESMod is based on BESTPar (Wüllhorst
+ et al. 2022). This approach minimizes manual parameterization
+ efforts by propagating system design parameters from the top down to
+ each subsystem.
+
+
+ Top-Down Parameters
+
+
+ Top-down parameters are defined at the system level and propagated to
+ subsystems. These parameters include:
+
+
+ -
+ System Parameters Record:
+
+ -
+ Heat Demand:
QBui_flow_nominal
+
+ -
+ Temperature Levels:
+
+ - Outdoor Temperature:
TOda_nominal
+
+ - Hydraulic Supply Temperature:
+
THydSup_nominal
+
+ - etc.
+
+
+
+
+
+ -
+ Building Model Parameters
+
+ -
+ DHW (Domestic Hot Water) System Parameters
+
+
+
+ Bottom-Up Parameters
+
+
+ Bottom-up parameters are defined within subsystems and propagated
+ upwards to connected subsystems using Sup_nominal and
+ Dem_nominal parameters. The nominal parameters
+ of component models, e.g. from IBPSA, are either directly set by top-down parameters or
+ calculated using physics-based or rule-based equations. Relevant
+ nominal parameters are also propagated to the control
+ systems. For general information on nominal parameters,
+ we refer the the IBPSA UsersGuide:
+ IBPSA.Fluid.UsersGuide.
+
+
+ Subsystem Design Parameters
+
+
+ In IBPSA, the nominal parameters define both nominal value
+ during simulation and the design condition. For instance, the radiator
+ has Q_flow_nominal which specifies the design size of the
+ component. In BES, partial or full retrofit can lead to cases where the old
+ componentes are kept (e.g. pipes, radiators, etc.) but the nominal heat flow
+ rate and supply temperatures changes.
+ To consider such cases, each subsystem has internal design
+ parameters to define the actual design of components. Typically, design parameters are
+ equivalent to nominal parameters but can be specified separately if
+ needed. Both nominal and design parameters
+ are used to parameterize components, either directly or through additional
+ physics-based or rule-based equations and design-independent parameters.
+
+
+ Partially Retrofitted Hydraulic System
+
+
+ To facilitate minimal parameterization effort for a partially
+ retrofitted hydraulic system, parameters representing an old building
+ state can be set. These parameters include:
+
+
+ -
+ Top-Down System Parameters for Old Building State:
+
+ -
+ Heat Demand of Old Building:
+
QBuiOld_flow_design
+
+ -
+ Hydraulic Supply Temperature of Old Building:
+
THydSupOld_design
+
+
+
+ -
+ Subsystem Parameters for Old Building State:
+
+ -
+
SupOld_design
+
+ -
+
DemOld_design
+
+
+
+
+
+ All Old_design parameters represent the complete old
+ building state and are propagated similarly to nominal
+ parameters, but not to control systems. With these parameters, each
+ hydraulic subsystem has complete knowledge of both the old and
+ operational building states.
+
+
+ Parameterization for Partially Retrofitted Systems
+
+
+ Subsystems that support automatic parameterization for partial
+ retrofits include a use_old_design parameter. This
+ parameter allows the subsystem to use either the old design
+ parameters or the nominal parameters based on whether the subsystem
+ or a parallel path within the subsystem (TODO: What does that mean?)
+ has been retrofitted. If a
+ parameter of this type does not exist or is set to final use_old_design=false,
+ the parameterization is done with the nominal values.
+
+
+ Example usage:
+
+Q_flow_design = {if use_old_design[i] then QOld_flow_design[i] else Q_flow_nominal[i] for i in 1:nParallelDem}
+
+ Design parameters can be selectively applied to specific components,
+ while others are always parameterized using nominal parameters. For
+ example, the radiator transfer systems have a `use_oldRad_design`
+ parameter and only the radiator is parameterized with the design
+ parameters, while all other components like the pump and thermostat
+ valve are parameterized with the nominal parameters.
+
+
+"));
+end Parameterization;
diff --git a/BESMod/UsersGuide/GettingStarted/package.order b/BESMod/UsersGuide/GettingStarted/package.order
index e28b4680..0a07e237 100644
--- a/BESMod/UsersGuide/GettingStarted/package.order
+++ b/BESMod/UsersGuide/GettingStarted/package.order
@@ -1,2 +1,3 @@
SubmoduleDocumentation
SystemDocumentation
+Parameterization
diff --git a/BESMod/unitTests-dymola.log b/BESMod/unitTests-dymola.log
new file mode 100644
index 00000000..10562e19
--- /dev/null
+++ b/BESMod/unitTests-dymola.log
@@ -0,0 +1,10 @@
+Regression tests are only run for the following package:
+ BESMod.Examples.ModelicaConferencePaper
+Regression tests are only run for the following package:
+ BESMod.Examples.BAUSimStudy
+Regression tests are only run for the following package:
+ BESMod.Examples.TEASERHeatLoadCalculation
+Regression tests are only run for the following package:
+ BESMod.Examples.HeatPumpAndBoiler
+Regression tests are only run for the following package:
+ BESMod.Examples
diff --git a/ci-tests/config/templates_generator_config.toml b/ci-tests/config/templates_generator_config.toml
index 9b2f05e5..d7406c7f 100644
--- a/ci-tests/config/templates_generator_config.toml
+++ b/ci-tests/config/templates_generator_config.toml
@@ -150,7 +150,7 @@ name = "model_check"
order = 4.0
[stage_names.OM_model_check]
-name = "OM_model_check"
+name = "model_check"
order = 4.1
[stage_names.simulate]
@@ -158,7 +158,7 @@ name = "simulate"
order = 5.0
[stage_names.OM_simulate]
-name = "OM_simulate"
+name = "simulate"
order = 5.1
[stage_names.regression_test]
diff --git a/ci-tests/scripts/.gitlab-ci.yml b/ci-tests/scripts/.gitlab-ci.yml
index 3e788b19..85041318 100644
--- a/ci-tests/scripts/.gitlab-ci.yml
+++ b/ci-tests/scripts/.gitlab-ci.yml
@@ -9,9 +9,7 @@ stages:
- HTML_Check
- Style_check
- model_check
- - OM_model_check
- simulate
- - OM_simulate
- RegressionTest
- plot_ref
- prepare
diff --git a/ci-tests/scripts/syntax_tests/html_check.gitlab-ci.yml b/ci-tests/scripts/syntax_tests/html_check.gitlab-ci.yml
index 19d1d486..6045145c 100644
--- a/ci-tests/scripts/syntax_tests/html_check.gitlab-ci.yml
+++ b/ci-tests/scripts/syntax_tests/html_check.gitlab-ci.yml
@@ -11,7 +11,7 @@
# library : BESMod
# ci_html_commit : ci_html
# ModelicaPyCI.api_script.api_github : modelicapyci_api_github_module
-# arg_PR : --filter-whitelist-flag --correct-view-flag --log-flag --whitelist-library IBPSA --library BESMod --packages Examples Tutorial Utilities Systems
+# arg_push : --filter-whitelist-flag --correct-view-flag --log-flag --whitelist-library IBPSA --library BESMod --packages Examples Tutorial Utilities Systems
# arg_wh : --filter-whitelist-flag --log-flag --whitelist-library IBPSA
# bot_create_html_file_commit : CI message from ebc-aixlib-bot. Push new files with corrected html Syntax .
@@ -29,19 +29,23 @@ variables:
-Check_HTML:PR:
+Check_HTML:push:
stage: HTML_Check
before_script:
- !reference [.activate_python_and_install_requirements, script]
script:
- python -m ModelicaPyCI.syntax.html_tidy --filter-whitelist-flag --correct-view-flag --log-flag --whitelist-library IBPSA --library BESMod --packages Examples Tutorial Utilities Systems
after_script:
- - !reference [.activate_python_and_install_requirements, script]
- - !reference [.github_ssh_auth, script]
- - if ! cat ci-tests/Configfiles/exit.sh | grep "exit 1"; then
+ - if ! cat ci-tests/Configfiles/exit.sh | grep "Syntax Error"; then
exit 0;
fi
+ - !reference [.activate_python_and_install_requirements, script]
+ - !reference [.github_ssh_auth, script]
- python -m ModelicaPyCI.syntax.html_tidy --filter-whitelist-flag --log-flag --correct-overwrite-flag --whitelist-library IBPSA --library BESMod --packages Examples Tutorial Utilities Systems ;
+ - if [[ $CI_COMMIT_REF_NAME =~ ^$Praefix_Branch ]]; then
+ echo "Branch is already used to fix html, exiting";
+ exit 1;
+ fi
- git checkout -B $Newbranch;
- git add BESMod;
- git commit -m "CI message from ebc-aixlib-bot. Push new files with corrected html Syntax .";
@@ -55,9 +59,9 @@ Check_HTML:PR:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_html/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-Check_HTML:push:
+Check_HTML:changed:
stage: HTML_Check
before_script:
- !reference [.github_ssh_auth, script]
@@ -69,7 +73,7 @@ Check_HTML:push:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
Open_Pull_HTML_Request:
stage: open_PR
diff --git a/ci-tests/scripts/syntax_tests/naming_guideline.gitlab-ci.yml b/ci-tests/scripts/syntax_tests/naming_guideline.gitlab-ci.yml
index 9f618b3a..2545d090 100644
--- a/ci-tests/scripts/syntax_tests/naming_guideline.gitlab-ci.yml
+++ b/ci-tests/scripts/syntax_tests/naming_guideline.gitlab-ci.yml
@@ -12,7 +12,7 @@ stages:
- Style_check
-NamingGuideline:BESMod:PR:
+NamingGuideline:BESMod:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: Style_check
before_script:
@@ -26,5 +26,5 @@ NamingGuideline:BESMod:PR:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_check_naming/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
diff --git a/ci-tests/scripts/syntax_tests/style_check.gitlab-ci.yml b/ci-tests/scripts/syntax_tests/style_check.gitlab-ci.yml
index fe375a53..6ae1195c 100644
--- a/ci-tests/scripts/syntax_tests/style_check.gitlab-ci.yml
+++ b/ci-tests/scripts/syntax_tests/style_check.gitlab-ci.yml
@@ -6,15 +6,15 @@
# library : BESMod
# ci_style_commit : ci_style_check
# result_dir : ci-tests/result
-# arg_PR : --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --library BESMod
-# arg_Push : --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --library BESMod
+# arg_push : --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --library BESMod
+# arg_changed : --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --library BESMod
include: 'ci-tests/scripts/utilities.yml'
stages:
- Style_check
-StyleCheck:BESMod:PR:
+StyleCheck:BESMod:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: Style_check
before_script:
@@ -30,9 +30,9 @@ StyleCheck:BESMod:PR:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_style_check/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-StyleCheck:BESMod:Push:
+StyleCheck:BESMod:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: Style_check
before_script:
@@ -46,5 +46,5 @@ StyleCheck:BESMod:Push:
expire_in: 7 day
allow_failure: true
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
diff --git a/ci-tests/scripts/unit_tests/check_OM_model.gitlab-ci.yml b/ci-tests/scripts/unit_tests/check_OM_model.gitlab-ci.yml
index d109732c..7b915294 100644
--- a/ci-tests/scripts/unit_tests/check_OM_model.gitlab-ci.yml
+++ b/ci-tests/scripts/unit_tests/check_OM_model.gitlab-ci.yml
@@ -1,23 +1,23 @@
-# ci_stage_OM_model_check: OM_model_check
+# ci_stage_OM_model_check: model_check
# library: BESMod
# ci_OM_check_commit: ci_om_check
# OM_Image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
# OM_python_check_model_module: ModelicaPyCI.unittest.om_check
# result_dir: ci-tests/result
# expire_in_time: 7h
-# arg_PR: --om-options OM_CHECK --startup-mos startup.mos --whitelist-library IBPSA --packages $lib_package --library BESMod
-# arg_push: --om-options OM_CHECK --startup-mos startup.mos --changed-flag --whitelist-library IBPSA --packages $lib_package --library BESMod
+# arg_push: --om-options OM_CHECK --startup-mos startup.mos --whitelist-library IBPSA --packages $lib_package --library BESMod
+# arg_changed: --om-options OM_CHECK --startup-mos startup.mos --changed-flag --whitelist-library IBPSA --packages $lib_package --library BESMod
# packages_per_job: {'Examples': 'Examples', 'Systems': 'Systems', 'Other': 'Tutorial Utilities'}
include: 'ci-tests/scripts/utilities.yml'
stages:
- - OM_model_check
+ - model_check
-.OM_check_model_job:PR:
+.OM_check_model_job:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
- stage: OM_model_check
+ stage: model_check
before_script:
- !reference [.activate_python_and_install_requirements, script]
- !reference [.custom_install_additional_modelica_libraries, script]
@@ -33,11 +33,11 @@ stages:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_om_check/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-.OM_check_model_job:push:
+.OM_check_model_job:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
- stage: OM_model_check
+ stage: model_check
before_script:
- !reference [.activate_python_and_install_requirements, script]
- !reference [.custom_install_additional_modelica_libraries, script]
@@ -51,36 +51,36 @@ stages:
expire_in: 7h
allow_failure: true
rules:
- - !reference [.rules:push, rules]
+ - !reference [.rules:changed, rules]
-OM_Check_BESMod_Examples:PR:
+OM_Check_BESMod_Examples:push:
variables:
lib_package: Examples
- extends: .OM_check_model_job:PR
+ extends: .OM_check_model_job:push
-OM_Check_BESMod_Systems:PR:
+OM_Check_BESMod_Systems:push:
variables:
lib_package: Systems
- extends: .OM_check_model_job:PR
+ extends: .OM_check_model_job:push
-OM_Check_BESMod_Other:PR:
+OM_Check_BESMod_Other:push:
variables:
lib_package: Tutorial Utilities
- extends: .OM_check_model_job:PR
+ extends: .OM_check_model_job:push
-OM_Check_BESMod_Examples:push:
+OM_Check_BESMod_Examples:changed:
variables:
lib_package: Examples
- extends: .OM_check_model_job:push
+ extends: .OM_check_model_job:changed
-OM_Check_BESMod_Systems:push:
+OM_Check_BESMod_Systems:changed:
variables:
lib_package: Systems
- extends: .OM_check_model_job:push
+ extends: .OM_check_model_job:changed
-OM_Check_BESMod_Other:push:
+OM_Check_BESMod_Other:changed:
variables:
lib_package: Tutorial Utilities
- extends: .OM_check_model_job:push
+ extends: .OM_check_model_job:changed
diff --git a/ci-tests/scripts/unit_tests/check_model.gitlab-ci.yml b/ci-tests/scripts/unit_tests/check_model.gitlab-ci.yml
index 954c853f..88669cd2 100644
--- a/ci-tests/scripts/unit_tests/check_model.gitlab-ci.yml
+++ b/ci-tests/scripts/unit_tests/check_model.gitlab-ci.yml
@@ -9,8 +9,8 @@
# result_dir: ci-tests/result
# expire_in_time: 7h
# ci_create_model_whitelist_commit: ci_create_model_whitelist
-# arg_push: --dym-options DYM_CHECK --filter-whitelist-flag --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
-# arg_PR: --dym-options DYM_CHECK --filter-whitelist-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
+# arg_changed: --dym-options DYM_CHECK --filter-whitelist-flag --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
+# arg_push: --dym-options DYM_CHECK --filter-whitelist-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
# config_ci_exit_file: ci-tests/Configfiles/exit.sh
# bot_update_model_whitelist_commit: CI message from ebc-aixlib-bot. Update file whitelist-check_file. Please pull the new files before push again.
# whitelist_model_file: dymola_check_whitelist.txt
@@ -25,7 +25,7 @@ stages:
- create_model_whitelist
-.check_model_job:PR:
+.check_model_job:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: model_check
before_script:
@@ -41,9 +41,9 @@ stages:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_check/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-.check_model_job:Push:
+.check_model_job:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: model_check
before_script:
@@ -57,38 +57,38 @@ stages:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
-Check_BESMod_Examples:PR:
+Check_BESMod_Examples:push:
variables:
lib_package: Examples
- extends: .check_model_job:PR
+ extends: .check_model_job:push
-Check_BESMod_Systems:PR:
+Check_BESMod_Systems:push:
variables:
lib_package: Systems
- extends: .check_model_job:PR
+ extends: .check_model_job:push
-Check_BESMod_Other:PR:
+Check_BESMod_Other:push:
variables:
lib_package: Tutorial Utilities
- extends: .check_model_job:PR
+ extends: .check_model_job:push
-Check_BESMod_Examples:Push:
+Check_BESMod_Examples:changed:
variables:
lib_package: Examples
- extends: .check_model_job:Push
+ extends: .check_model_job:changed
-Check_BESMod_Systems:Push:
+Check_BESMod_Systems:changed:
variables:
lib_package: Systems
- extends: .check_model_job:Push
+ extends: .check_model_job:changed
-Check_BESMod_Other:Push:
+Check_BESMod_Other:changed:
variables:
lib_package: Tutorial Utilities
- extends: .check_model_job:Push
+ extends: .check_model_job:changed
check_whitelist_job:
diff --git a/ci-tests/scripts/unit_tests/regression_test.gitlab-ci.yml b/ci-tests/scripts/unit_tests/regression_test.gitlab-ci.yml
index b537119e..8fd08c03 100644
--- a/ci-tests/scripts/unit_tests/regression_test.gitlab-ci.yml
+++ b/ci-tests/scripts/unit_tests/regression_test.gitlab-ci.yml
@@ -10,8 +10,8 @@
# result_dir : ci-tests/result
# ci_regression_test_commit : $ {ci_regression_test_commit}
# expire_in_time : 7h
-# arg_PR: --batch --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --tool dymola --number-of-processors 4 --path . --library-root .. --packages $lib_package --library BESMod
-# arg_push: --changed-flag --batch --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --tool dymola --number-of-processors 4 --path . --library-root .. --packages $lib_package --library BESMod
+# arg_push: --batch --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --tool dymola --number-of-processors 4 --path . --library-root .. --packages $lib_package --library BESMod
+# arg_changed: --changed-flag --batch --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --tool dymola --number-of-processors 4 --path . --library-root .. --packages $lib_package --library BESMod
# arg_chart: --funnel-comp-flag --error-flag --templates-url https://github.com/RWTH-EBC/MoCITempGen.git@03_openModelica --library BESMod --packages $lib_package
# packages_per_job: {'Examples': 'Examples', 'Systems': 'Systems', 'Other': 'Tutorial Utilities'}
# modelicapyci_api_github_module: ModelicaPyCI.api_script.api_github
@@ -36,7 +36,7 @@ stages:
- prepare
-.Regressiontest:PR:
+.Regressiontest:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: RegressionTest
before_script:
@@ -59,11 +59,11 @@ stages:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
- if: $CI_COMMIT_MESSAGE =~ /ci_regression_test/ && $CI_PIPELINE_SOURCE == "push"
when: always
-.Regressiontest:Push:
+.Regressiontest:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: RegressionTest
before_script:
@@ -86,41 +86,41 @@ stages:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
-Regressiontest_BESMod_Examples:PR:
+Regressiontest_BESMod_Examples:push:
variables:
lib_package: Examples
- extends: .Regressiontest:PR
+ extends: .Regressiontest:push
-Regressiontest_BESMod_Systems:PR:
+Regressiontest_BESMod_Systems:push:
variables:
lib_package: Systems
- extends: .Regressiontest:PR
+ extends: .Regressiontest:push
-Regressiontest_BESMod_Other:PR:
+Regressiontest_BESMod_Other:push:
variables:
lib_package: Tutorial Utilities
- extends: .Regressiontest:PR
+ extends: .Regressiontest:push
-Regressiontest_BESMod_Examples:Push:
+Regressiontest_BESMod_Examples:changed:
variables:
lib_package: Examples
- extends: .Regressiontest:Push
+ extends: .Regressiontest:changed
-Regressiontest_BESMod_Systems:Push:
+Regressiontest_BESMod_Systems:changed:
variables:
lib_package: Systems
- extends: .Regressiontest:Push
+ extends: .Regressiontest:changed
-Regressiontest_BESMod_Other:Push:
+Regressiontest_BESMod_Other:changed:
variables:
lib_package: Tutorial Utilities
- extends: .Regressiontest:Push
+ extends: .Regressiontest:changed
-Regression_overall_coverage:PR:
+Regression_overall_coverage:push:
stage: RegressionTest
before_script:
- !reference [.activate_python_and_install_requirements, script]
@@ -134,11 +134,11 @@ Regression_overall_coverage:PR:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
- if: $CI_COMMIT_MESSAGE =~ /ci_regression_test/ && $CI_PIPELINE_SOURCE == "push"
when: always
-Regression_overall_coverage:Push:
+Regression_overall_coverage:changed:
stage: RegressionTest
before_script:
- !reference [.activate_python_and_install_requirements, script]
@@ -152,7 +152,7 @@ Regression_overall_coverage:Push:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
RegressionTest_Check_References:
@@ -188,6 +188,6 @@ RegressionTest_Check_References:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
- if: $CI_COMMIT_MESSAGE =~ /ci_reference_check/ && $CI_PIPELINE_SOURCE == "push"
when: always
diff --git a/ci-tests/scripts/unit_tests/simulate_OM_model.gitlab-ci.yml b/ci-tests/scripts/unit_tests/simulate_OM_model.gitlab-ci.yml
index b6332b5d..22f0b4bb 100644
--- a/ci-tests/scripts/unit_tests/simulate_OM_model.gitlab-ci.yml
+++ b/ci-tests/scripts/unit_tests/simulate_OM_model.gitlab-ci.yml
@@ -1,10 +1,10 @@
# Variables
-# ci_stage_OM_simulate: OM_simulate
+# ci_stage_OM_simulate: simulate
# library: BESMod
# ci_OM_sim_commit: ci_om_simulate
# OM_python_check_model_module: ModelicaPyCI.unittest.om_check
-# arg_PR : --om-options OM_SIM --startup-mos startup.mos --whitelist-library IBPSA --packages Examples Tutorial Utilities Systems --library BESMod
-# arg_push: --om-options OM_SIM --startup-mos startup.mos --changed-flag --whitelist-library IBPSA --packages Examples Tutorial Utilities Systems --library BESMod
+# arg_push : --om-options OM_SIM --startup-mos startup.mos --whitelist-library IBPSA --packages Examples Tutorial Utilities Systems --library BESMod
+# arg_changed: --om-options OM_SIM --startup-mos startup.mos --changed-flag --whitelist-library IBPSA --packages Examples Tutorial Utilities Systems --library BESMod
# result_dir: ci-tests/result
# OM_Image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
# expire_in_time: 7h
@@ -13,12 +13,12 @@
include: 'ci-tests/scripts/utilities.yml'
stages:
- - OM_simulate
+ - simulate
-.OM_simulate_model_job:PR:
+.OM_simulate_model_job:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
- stage: OM_simulate
+ stage: simulate
before_script:
- !reference [.activate_python_and_install_requirements, script]
- !reference [.custom_install_additional_modelica_libraries, script]
@@ -34,11 +34,11 @@ stages:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_om_simulate/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-.OM_simulate_model_job:push:
+.OM_simulate_model_job:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/openmodelica-docker:main
- stage: OM_simulate
+ stage: simulate
before_script:
- !reference [.activate_python_and_install_requirements, script]
- !reference [.custom_install_additional_modelica_libraries, script]
@@ -52,38 +52,38 @@ stages:
expire_in: 7h
allow_failure: true
rules:
- - !reference [.rules:push, rules]
+ - !reference [.rules:changed, rules]
-OM_Simulate_BESMod_Examples:PR:
+OM_Simulate_BESMod_Examples:push:
variables:
lib_package: Examples
- extends: .OM_simulate_model_job:PR
+ extends: .OM_simulate_model_job:push
-OM_Simulate_BESMod_Systems:PR:
+OM_Simulate_BESMod_Systems:push:
variables:
lib_package: Systems
- extends: .OM_simulate_model_job:PR
+ extends: .OM_simulate_model_job:push
-OM_Simulate_BESMod_Other:PR:
+OM_Simulate_BESMod_Other:push:
variables:
lib_package: Tutorial Utilities
- extends: .OM_simulate_model_job:PR
+ extends: .OM_simulate_model_job:push
-OM_Simulate_BESMod_Examples:push:
+OM_Simulate_BESMod_Examples:changed:
variables:
lib_package: Examples
- extends: .OM_simulate_model_job:push
+ extends: .OM_simulate_model_job:changed
-OM_Simulate_BESMod_Systems:push:
+OM_Simulate_BESMod_Systems:changed:
variables:
lib_package: Systems
- extends: .OM_simulate_model_job:push
+ extends: .OM_simulate_model_job:changed
-OM_Simulate_BESMod_Other:push:
+OM_Simulate_BESMod_Other:changed:
variables:
lib_package: Tutorial Utilities
- extends: .OM_simulate_model_job:push
+ extends: .OM_simulate_model_job:changed
diff --git a/ci-tests/scripts/unit_tests/simulate_model.gitlab-ci.yml b/ci-tests/scripts/unit_tests/simulate_model.gitlab-ci.yml
index 85178305..c82a2ce3 100644
--- a/ci-tests/scripts/unit_tests/simulate_model.gitlab-ci.yml
+++ b/ci-tests/scripts/unit_tests/simulate_model.gitlab-ci.yml
@@ -2,8 +2,8 @@
# dym_image_name : registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
# ci_stage_simulate: simulate
# ci_stage_create_exampel_whitelist: create_example_whitelist
-# arg_push : --dym-options DYM_SIM --filter-whitelist-flag --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
-# arg_PR: --dym-options DYM_SIM --filter-whitelist-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
+# arg_changed : --dym-options DYM_SIM --filter-whitelist-flag --changed-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
+# arg_push: --dym-options DYM_SIM --filter-whitelist-flag --startup-mos startup.mos --min-number-of-unused-licences 5 --dymola-version 2022 --additional-libraries-to-load --packages $lib_package --library BESMod
# library: BESMod
# ci_check_commit ci_simulate
# modelicapyci_test_validate_module: ModelicaPyCI.unittest.validatetest
@@ -24,7 +24,7 @@ stages:
- create_example_whitelist
-.simulate_model_job:PR:
+.simulate_model_job:push:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: simulate
before_script:
@@ -40,9 +40,9 @@ stages:
rules:
- if: $CI_COMMIT_MESSAGE =~ /ci_simulate/ && $CI_PIPELINE_SOURCE == "push"
when: always
- - !reference [.rules:PR , rules]
+ - !reference [.rules:push , rules]
-.simulate_model_job:Push:
+.simulate_model_job:changed:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
stage: simulate
before_script:
@@ -56,39 +56,39 @@ stages:
- ci-tests/result/
expire_in: 7h
rules:
- - !reference [.rules:push , rules]
+ - !reference [.rules:changed , rules]
-Simulate_BESMod_Examples:PR:
+Simulate_BESMod_Examples:push:
variables:
lib_package: Examples
- extends: .simulate_model_job:PR
+ extends: .simulate_model_job:push
-Simulate_BESMod_Systems:PR:
+Simulate_BESMod_Systems:push:
variables:
lib_package: Systems
- extends: .simulate_model_job:PR
+ extends: .simulate_model_job:push
-Simulate_BESMod_Other:PR:
+Simulate_BESMod_Other:push:
variables:
lib_package: Tutorial Utilities
- extends: .simulate_model_job:PR
+ extends: .simulate_model_job:push
-Simulate_BESMod_Examples:Push:
+Simulate_BESMod_Examples:changed:
variables:
lib_package: Examples
- extends: .simulate_model_job:Push
+ extends: .simulate_model_job:changed
-Simulate_BESMod_Systems:Push:
+Simulate_BESMod_Systems:changed:
variables:
lib_package: Systems
- extends: .simulate_model_job:Push
+ extends: .simulate_model_job:changed
-Simulate_BESMod_Other:Push:
+Simulate_BESMod_Other:changed:
variables:
lib_package: Tutorial Utilities
- extends: .simulate_model_job:Push
+ extends: .simulate_model_job:changed
simulate_whitelist_job:
diff --git a/ci-tests/scripts/utilities.yml b/ci-tests/scripts/utilities.yml
index 88cb03a8..a3e6a133 100644
--- a/ci-tests/scripts/utilities.yml
+++ b/ci-tests/scripts/utilities.yml
@@ -35,18 +35,18 @@
- apt-get install git-lfs -y
- python install_dependencies.py full
-.rules:PR:
+.rules:push:
rules:
- - if: $CI_PIPELINE_SOURCE == "external_pull_request_event" && $CI_COMMIT_MESSAGE !~ /ci_update_ref/ && $CI_COMMIT_MESSAGE !~ /ci_show_ref/ && $CI_COMMIT_MESSAGE !~ /ci_dif_ref/ && $CI_COMMIT_MESSAGE !~ /ci_create_model_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_html_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_example_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_om_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_check/ && $CI_COMMIT_MESSAGE !~ /ci_om_check/ && $CI_COMMIT_MESSAGE !~ /ci_regression_test/ && $CI_COMMIT_MESSAGE !~ /ci_html/ && $CI_COMMIT_MESSAGE !~ /ci_setting/ && $CI_COMMIT_MESSAGE !~ /ci_style_check/ && $CI_COMMIT_MESSAGE !~ /ci_trigger_ibpsa/ && $CI_COMMIT_MESSAGE !~ /ci_merge_except/ && $CI_COMMIT_MESSAGE !~ /ci_correct_html/ && $CI_COMMIT_MESSAGE !~ /ci_build_structure/ && $CI_COMMIT_MESSAGE !~ /ci_build_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_reference_check/ && $CI_COMMIT_MESSAGE !~ /ci_check_naming/
+ - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE !~ /ci_update_ref/ && $CI_COMMIT_MESSAGE !~ /ci_show_ref/ && $CI_COMMIT_MESSAGE !~ /ci_dif_ref/ && $CI_COMMIT_MESSAGE !~ /ci_create_model_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_html_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_example_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_om_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_check/ && $CI_COMMIT_MESSAGE !~ /ci_om_check/ && $CI_COMMIT_MESSAGE !~ /ci_regression_test/ && $CI_COMMIT_MESSAGE !~ /ci_html/ && $CI_COMMIT_MESSAGE !~ /ci_setting/ && $CI_COMMIT_MESSAGE !~ /ci_style_check/ && $CI_COMMIT_MESSAGE !~ /ci_trigger_ibpsa/ && $CI_COMMIT_MESSAGE !~ /ci_merge_except/ && $CI_COMMIT_MESSAGE !~ /ci_correct_html/ && $CI_COMMIT_MESSAGE !~ /ci_build_structure/ && $CI_COMMIT_MESSAGE !~ /ci_build_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_reference_check/ && $CI_COMMIT_MESSAGE !~ /ci_check_naming/
when: on_success
- - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" )
+ - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" )
when: on_success
-.rules:push:
+.rules:changed:
rules:
- - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE !~ /ci_update_ref/ && $CI_COMMIT_MESSAGE !~ /ci_show_ref/ && $CI_COMMIT_MESSAGE !~ /ci_dif_ref/ && $CI_COMMIT_MESSAGE !~ /ci_create_model_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_html_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_example_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_om_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_check/ && $CI_COMMIT_MESSAGE !~ /ci_om_check/ && $CI_COMMIT_MESSAGE !~ /ci_regression_test/ && $CI_COMMIT_MESSAGE !~ /ci_html/ && $CI_COMMIT_MESSAGE !~ /ci_setting/ && $CI_COMMIT_MESSAGE !~ /ci_style_check/ && $CI_COMMIT_MESSAGE !~ /ci_trigger_ibpsa/ && $CI_COMMIT_MESSAGE !~ /ci_merge_except/ && $CI_COMMIT_MESSAGE !~ /ci_correct_html/ && $CI_COMMIT_MESSAGE !~ /ci_build_structure/ && $CI_COMMIT_MESSAGE !~ /ci_build_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_reference_check/ && $CI_COMMIT_MESSAGE !~ /ci_check_naming/
+ - if: $CI_COMMIT_MESSAGE =~ /ci_changed_only/ && $CI_COMMIT_MESSAGE !~ /ci_update_ref/ && $CI_COMMIT_MESSAGE !~ /ci_show_ref/ && $CI_COMMIT_MESSAGE !~ /ci_dif_ref/ && $CI_COMMIT_MESSAGE !~ /ci_create_model_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_html_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_create_example_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_om_simulate/ && $CI_COMMIT_MESSAGE !~ /ci_check/ && $CI_COMMIT_MESSAGE !~ /ci_om_check/ && $CI_COMMIT_MESSAGE !~ /ci_regression_test/ && $CI_COMMIT_MESSAGE !~ /ci_html/ && $CI_COMMIT_MESSAGE !~ /ci_setting/ && $CI_COMMIT_MESSAGE !~ /ci_style_check/ && $CI_COMMIT_MESSAGE !~ /ci_trigger_ibpsa/ && $CI_COMMIT_MESSAGE !~ /ci_merge_except/ && $CI_COMMIT_MESSAGE !~ /ci_correct_html/ && $CI_COMMIT_MESSAGE !~ /ci_build_structure/ && $CI_COMMIT_MESSAGE !~ /ci_build_whitelist/ && $CI_COMMIT_MESSAGE !~ /ci_reference_check/ && $CI_COMMIT_MESSAGE !~ /ci_check_naming/
when: on_success
- - if: ($CI_COMMIT_BRANCH == "main" )
+ - if: ($CI_COMMIT_BRANCH == "main" )
when: never
.open_modelica_git_user_setting: