Add energy balance KPI block for TEASER building (#93)

RWTH-EBC · Nov 11, 2024 · 42e9137 · 42e9137
2 parents 7f16602 + 1fafc84
commit 42e9137
Show file tree

Hide file tree

Showing 27 changed files with 566 additions and 313 deletions.
diff --git a/BESMod/Examples/BAUSimStudy/Case1Standard.mo b/BESMod/Examples/BAUSimStudy/Case1Standard.mo
@@ -6,9 +6,11 @@ model Case1Standard
   systemParameters(TOda_nominal=263.15, THydSup_nominal={328.15}));
   extends Modelica.Icons.Example;
 
-  annotation (experiment(StopTime=172800,
-     Interval=600,
-     Tolerance=1e-06),
+  annotation (experiment(
+      StopTime=31536000,
+      Interval=599.999616,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Dassl"),
    __Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/BAUSimStudy/Case1Standard.mos"
         "Simulate and plot"));
 end Case1Standard;
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt
@@ -8,7 +8,7 @@ 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",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "101",
+  "number of continuous time states": "113",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "68",
+  "number of continuous time states": "80",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "49",
+  "number of continuous time states": "61",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 6, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "42",
+  "number of continuous time states": "54",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...esources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt b/...esources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt
@@ -8,7 +8,7 @@ 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, 0, 0, 0, 7, 0, 0, 0, 0, 0,   0, 0, 0, 0",
   "nonlinear": "1, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "141",
+  "number of continuous time states": "153",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...urces/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt b/...urces/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt
@@ -8,7 +8,7 @@ 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, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "107",
+  "number of continuous time states": "119",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "3, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "75",
+  "number of continuous time states": "87",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "74",
+  "number of continuous time states": "86",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...ources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt b/...ources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 1, 1, 6, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "81",
+  "number of continuous time states": "82",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt
@@ -8,7 +8,7 @@ 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",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "101",
+  "number of continuous time states": "113",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt
@@ -8,7 +8,7 @@ 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",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "101",
+  "number of continuous time states": "113",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt
@@ -8,7 +8,7 @@ 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",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "101",
+  "number of continuous time states": "113",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/...sources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt b/...sources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt
@@ -8,7 +8,7 @@ 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "234",
+  "number of continuous time states": "246",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...rces/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt b/...rces/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt
@@ -8,7 +8,7 @@ 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "236",
+  "number of continuous time states": "248",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...d/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt b/...d/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt
@@ -7,7 +7,7 @@ statistics-simulation=
 {
   "linear": "10, 0, 0",
   "nonlinear": "1, 0, 1, 0, 1, 0, 1",
-  "number of continuous time states": "21",
+  "number of continuous time states": "35",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Systems/Demand/Building/Components/BaseClasses/package.mo b/BESMod/Systems/Demand/Building/Components/BaseClasses/package.mo
@@ -1,3 +1,4 @@
 within BESMod.Systems.Demand.Building.Components;
 package BaseClasses "Bases package for components"
+  extends Modelica.Icons.BasesPackage;
 end BaseClasses;