Merge pull request #1734 from lbl-srg/issue1711_bestest_results

Issue1711 bestest results
lbl-srg · Mar 24, 2020 · f3fdce9 · f3fdce9
2 parents d54e7a5 + d48ba1f
commit f3fdce9
Show file tree

Hide file tree

Showing 35 changed files with 2,642 additions and 82 deletions.
diff --git a/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf b/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf
diff --git a/...s/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.png b/...s/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.png
diff --git a/.../Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf b/.../Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf
diff --git a/.../Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png b/.../Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png
diff --git a/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf b/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf
diff --git a/...s/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.png b/...s/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.png
diff --git a/.../Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf b/.../Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf
diff --git a/.../Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.png b/.../Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf
diff --git a/...gs/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.png b/...gs/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf
diff --git a/...gs/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.png b/...gs/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf
diff --git a/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.png b/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.png
diff --git a/...dings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf b/...dings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf
diff --git a/...urces/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png b/...urces/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf
diff --git a/...ources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.png b/...ources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf
diff --git a/...ources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.png b/...ources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf
diff --git a/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.png b/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf
diff --git a/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.png b/...s/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf
diff --git a/...ings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.png b/...ings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf
diff --git a/...ings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.png b/...ings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.png
diff --git a/Buildings/Resources/src/ThermalZones/Detailed/Validation/BESTEST/ASHRAE140_data.dat b/Buildings/Resources/src/ThermalZones/Detailed/Validation/BESTEST/ASHRAE140_data.dat
diff --git a/Buildings/Resources/src/ThermalZones/Detailed/Validation/BESTEST/simulateAndPlot.py b/Buildings/Resources/src/ThermalZones/Detailed/Validation/BESTEST/simulateAndPlot.py
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/BaseClasses/DaySchedule.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/BaseClasses/DaySchedule.mo
@@ -1,18 +1,9 @@
 within Buildings.ThermalZones.Detailed.Validation.BESTEST.BaseClasses;
 model DaySchedule "Schedule that repeats every day"
-  extends Modelica.Blocks.Sources.CombiTimeTable(
-    final tableOnFile=false,
-    final tableName="NoName",
-    final fileName="NoName",
-    final columns=2:size(table, 2),
-    final smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments,
-    final extrapolation=if size(table, 1) == 1
-     then
-       Modelica.Blocks.Types.Extrapolation.HoldLastPoint
-     else
-       Modelica.Blocks.Types.Extrapolation.Periodic,
-    final offset=fill(0, size(table, 2)-1),
-    final startTime=0);
+  extends Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable(
+    final smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments,
+    final extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.Periodic,
+    final offset=fill(0, size(table, 2)-1));
   annotation (Documentation(info="<html>
 <p>
 Time schedule that is used for set points.

diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo
@@ -6,26 +6,31 @@ model Case600 "Case 600FF, but with dual-setpoint for heating and cooling"
     annualCoo(Min=-6.137*3.6e9, Max=-7.964*3.6e9, Mean=-6.832*3.6e9),
     peakHea(Min=3.437*1000, Max=4.354*1000, Mean=4.000*1000),
     peakCoo(Min=-5.965*1000, Max=-6.827*1000, Mean=-6.461*1000)));
-  Controls.Continuous.LimPID conHea(
+  Buildings.Controls.OBC.CDL.Continuous.LimPID conHea(
     Td=60,
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
+    yMax=1,
+    yMin=0,
+    initType=Buildings.Controls.OBC.CDL.Types.Init.InitialState,
     Ti=300,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1) "Controller for heating"
     annotation (Placement(transformation(extent={{-72,30},{-64,38}})));
-  Controls.Continuous.LimPID conCoo(
+  Buildings.Controls.OBC.CDL.Continuous.LimPID conCoo(
     Td=60,
+    yMax=1,
+    yMin=0,
     reverseAction=true,
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
+    initType=Buildings.Controls.OBC.CDL.Types.Init.InitialState,
     Ti=300,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1) "Controller for cooling"
     annotation (Placement(transformation(extent={{-72,8},{-64,16}})));
-  Modelica.Blocks.Math.Gain gaiHea(k=1E6) "Gain for heating"
+  Buildings.Controls.OBC.CDL.Continuous.Gain gaiHea(k=1E6) "Gain for heating"
     annotation (Placement(transformation(extent={{-58,30},{-50,38}})));
-  Modelica.Blocks.Math.Gain gaiCoo(k=-1E6) "Gain for cooling"
+  Buildings.Controls.OBC.CDL.Continuous.Gain gaiCoo(k=-1E6) "Gain for cooling"
     annotation (Placement(transformation(extent={{-58,8},{-50,16}})));
-  Modelica.Blocks.Math.Sum sum1(nin=2)
+  Modelica.Blocks.Math.Sum sumHeaCoo(nin=2)
+    "Sum of heating and cooling heat flow rate"
     annotation (Placement(transformation(extent={{-20,20},{-12,28}})));
   Modelica.Blocks.Routing.Multiplex2 multiplex2
     annotation (Placement(transformation(extent={{-36,20},{-28,28}})));
@@ -66,51 +71,51 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(conHea.y,gaiHea. u) annotation (Line(
-      points={{-63.6,34},{-58.8,34}},
+      points={{-63.2,34},{-58.8,34}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(conCoo.y,gaiCoo. u)  annotation (Line(
-      points={{-63.6,12},{-58.8,12}},
+      points={{-63.2,12},{-58.8,12}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(gaiHea.y,multiplex2. u1[1]) annotation (Line(
-      points={{-49.6,34},{-42,34},{-42,26.4},{-36.8,26.4}},
+      points={{-49.2,34},{-42,34},{-42,26.4},{-36.8,26.4}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(gaiCoo.y,multiplex2. u2[1]) annotation (Line(
-      points={{-49.6,12},{-42,12},{-42,21.6},{-36.8,21.6}},
+      points={{-49.2,12},{-42,12},{-42,21.6},{-36.8,21.6}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(multiplex2.y,sum1.u) annotation (Line(
+  connect(multiplex2.y, sumHeaCoo.u) annotation (Line(
       points={{-27.6,24},{-20.8,24}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(sum1.y,preHea. Q_flow) annotation (Line(
+  connect(sumHeaCoo.y, preHea.Q_flow) annotation (Line(
       points={{-11.6,24},{-6,24}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(EHea.u,gaiHea. y) annotation (Line(
-      points={{-20.8,40},{-32,40},{-32,34},{-49.6,34}},
+      points={{-20.8,40},{-32,40},{-32,34},{-49.2,34}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(ECoo.u,gaiCoo. y) annotation (Line(
-      points={{-20.8,10},{-34,10},{-34,12},{-49.6,12}},
+      points={{-20.8,10},{-34,10},{-34,12},{-49.2,12}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(TSetHea.y[1],conHea. u_s) annotation (Line(
-      points={{-83.6,34},{-72.8,34}},
+      points={{-83.2,34},{-72.8,34}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(TSetCoo.y[1],conCoo. u_s) annotation (Line(
-      points={{-83.6,12},{-72.8,12}},
+      points={{-83.2,12},{-72.8,12}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(PCoo.u,gaiCoo. y) annotation (Line(
-      points={{-20.8,-4},{-42,-4},{-42,12},{-49.6,12}},
+      points={{-20.8,-4},{-42,-4},{-42,12},{-49.2,12}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(PHea.u,gaiHea. y) annotation (Line(
-      points={{-20.8,52},{-42,52},{-42,34},{-49.6,34}},
+      points={{-20.8,52},{-42,52},{-42,34},{-49.2,34}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(preHea.port, roo.heaPorAir) annotation (Line(