Corrected input for enabling freeze set back (#3088)

* corrected input for enabling freeze protection setback mode
lbl-srg · Aug 9, 2022 · 13a429d · 13a429d
1 parent 601068a
commit 13a429d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo
@@ -270,8 +270,6 @@ equation
           {-28,90},{-28,18},{58,18}}, color={255,0,255}));
   connect(zonSta.yEndSetBac, opeModSel.uEndSetBac) annotation (Line(points={{-58,
           88},{32,88},{32,16},{58,16}}, color={255,0,255}));
-  connect(TZon, opeModSel.TZonMax) annotation (Line(points={{-180,110},{-140,110},
-          {-140,14},{58,14}}, color={0,0,127}));
   connect(TZon, opeModSel.TZonMin) annotation (Line(points={{-180,110},{-140,110},
           {-140,12},{58,12}}, color={0,0,127}));
   connect(zonSta.yHigUnoCoo, opeModSel.uSetUp) annotation (Line(points={{-58,83},

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo
@@ -61,13 +61,6 @@ block OperationMode "Block that outputs the operation mode"
     "True when the setback mode could end"
     annotation (Placement(transformation(extent={{-400,-70},{-360,-30}}),
       iconTransformation(extent={{-140,-60},{-100,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMax(
-    final unit="K",
-    displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Maximum zone temperature"
-    annotation (Placement(transformation(extent={{-400,-100},{-360,-60}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMin(
     final unit="K",
     displayUnit="degC",
@@ -617,7 +610,6 @@ equation
     annotation (Line(points={{-380,90},{-340,90},{-340,-214},{-332,-214}}, color={255,127,0}));
   connect(addInt7.y, allHot.u1)
     annotation (Line(points={{-308,-220},{-282,-220}}, color={255,127,0}));
-
   connect(maxCooDowTim, sub3.u2) annotation (Line(points={{-380,280},{-338,280},
           {-338,244},{-302,244}}, color={0,0,127}));
   connect(maxWarCooTime.y, sub3.u1) annotation (Line(points={{-318,200},{-310,200},
@@ -632,7 +624,7 @@ equation
           154},{-162,154}}, color={0,0,127}));
   connect(actFreProTem.y, sub.u1) annotation (Line(points={{-258,-100},{-242,-100},
           {-242,-84},{-222,-84}}, color={0,0,127}));
-  connect(TZonMax, sub.u2) annotation (Line(points={{-380,-80},{-232,-80},{-232,
+  connect(TZonMin, sub.u2) annotation (Line(points={{-380,-120},{-230,-120},{-230,
           -96},{-222,-96}}, color={0,0,127}));
 annotation (
   defaultComponentName = "opeModSel",
@@ -748,7 +740,7 @@ annotation (
           pattern=LinePattern.Dash,
           textString="tNexOcc"),
         Text(
-          extent={{-100,144},{-82,136}},
+          extent={{-100,146},{-74,134}},
           textColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="uOcc"),
@@ -772,11 +764,6 @@ annotation (
           textColor={255,0,255},
           pattern=LinePattern.Dash,
           textString="uEndSetBac"),
-        Text(
-          extent={{-98,-54},{-64,-64}},
-          textColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonMax"),
         Text(
           extent={{-98,-74},{-64,-84}},
           textColor={0,0,127},
@@ -919,6 +906,11 @@ src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/
 </html>",revisions="<html>
 <ul>
 <li>
+August 5, 2022, by Jianjun Hu:<br/>
+Corrected the input for enabling freeze protection setback mode.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">#3084</a>.
+</li>
+<li>
 June 15, 2020, by Jianjun Hu:<br/>
 Upgraded the sequence according to ASHRAE Guideline 36, May 2020 version.
 </li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
@@ -99,8 +99,6 @@ equation
     annotation (Line(points={{22,-30},{38,-30}},   color={255,0,255}));
   connect(booToInt.y, opeModSel.totColZon) annotation (Line(points={{62,-30},{76,
           -30},{76,100},{118,100}}, color={255,127,0}));
-  connect(zonTem.y, opeModSel.TZonMax) annotation (Line(points={{-28,50},{58,50},
-          {58,94},{118,94}}, color={0,0,127}));
   connect(zonTem.y, opeModSel.TZonMin) annotation (Line(points={{-28,50},{64,50},
           {64,92},{118,92}}, color={0,0,127}));
   connect(zonTem.y, greEqu3.u1) annotation (Line(points={{-28,50},{-20,50},{-20,
@@ -145,8 +143,9 @@ equation
     annotation (Line(points={{-88,50},{-82,50}}, color={0,0,127}));
   connect(gai.y, zonTem.u)
     annotation (Line(points={{-58,50},{-52,50}}, color={0,0,127}));
-  connect(zonTem.y, sub1.u2) annotation (Line(points={{-38,50},{-20,50},{-20,-146},
-          {-2,-146}}, color={0,0,127}));
+  connect(zonTem.y, sub1.u2) annotation (Line(points={{-28,50},{-20,50},{-20,
+          -146},{-2,-146}},
+                      color={0,0,127}));
   connect(TZonCooSetUno.y, sub1.u1) annotation (Line(points={{-78,-100},{-40,-100},
           {-40,-134},{-2,-134}}, color={0,0,127}));
 

diff --git a/Buildings/Examples/VAVReheat/BaseClasses/Guideline36.mo b/Buildings/Examples/VAVReheat/BaseClasses/Guideline36.mo
@@ -284,8 +284,6 @@ equation
           {-120,280},{-120,298},{-102,298}},      color={255,0,255}));
   connect(zonGroSta.yEndSetBac, opeModSel.uEndSetBac) annotation (Line(points={{-138,
           278},{-118,278},{-118,296},{-102,296}},       color={255,0,255}));
-  connect(zonGroSta.TZonMax, opeModSel.TZonMax) annotation (Line(points={{-138,267},
-          {-116,267},{-116,294},{-102,294}},      color={0,0,127}));
   connect(zonGroSta.TZonMin, opeModSel.TZonMin) annotation (Line(points={{-138,265},
           {-114,265},{-114,292},{-102,292}},      color={0,0,127}));
   connect(zonGroSta.yHotZon, opeModSel.totHotZon) annotation (Line(points={{-138,
@@ -445,6 +443,12 @@ its input.
 </html>", revisions="<html>
 <ul>
 <li>
+August 5, 2022, by Jianjun Hu:<br/>
+Corrected the input for enabling freeze protection setback mode.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue #3084</a>.
+</li>
+<li>
 December 20, 2021, by Michael Wetter:<br/>
 Changed parameter declarations and added optimal start up.
 This is for

diff --git a/...mola/Buildings_Controls_OBC_ASHRAE_G36_PR1_Generic_SetPoints_Validation_OperationMode.txt b/...mola/Buildings_Controls_OBC_ASHRAE_G36_PR1_Generic_SetPoints_Validation_OperationMode.txt
@@ -1,4 +1,4 @@
-last-generated=2020-06-24
+last-generated=2022-08-05
 statistics-simulation=
 {
   "linear": " ",
@@ -17,4 +17,4 @@ TZonHeaSetUno.y=[2.851499938964844e+02, 2.851499938964844e+02]
 TZonCooSetUno.y=[3.031499938964844e+02, 3.031499938964844e+02]
 TZonHeaSetOcc.y=[2.931499938964844e+02, 2.931499938964844e+02]
 TZonCooSetOcc.y=[2.971499938964844e+02, 2.971499938964844e+02]
-opeModSel.TZonMax=[2.956499938964844e+02, 2.965604553222656e+02, 2.974673461914062e+02, 2.983670349121094e+02, 2.992560119628906e+02, 3.001307373046875e+02, 3.0098779296875e+02, 3.018237915039062e+02, 3.026354370117188e+02, 3.034194946289062e+02, 3.041728820800781e+02, 3.048926391601562e+02, 3.05575927734375e+02, 3.062200317382812e+02, 3.068224487304688e+02, 3.073807373046875e+02, 3.078927612304688e+02, 3.083564453125e+02, 3.087699890136719e+02, 3.091317443847656e+02, 3.094403076171875e+02, 3.096944580078125e+02, 3.098931579589844e+02, 3.100356750488281e+02, 3.101213989257812e+02, 3.101499938964844e+02, 3.101213989257812e+02, 3.100356750488281e+02, 3.098931579589844e+02, 3.096944580078125e+02, 3.094403076171875e+02, 3.091317443847656e+02, 3.087699890136719e+02, 3.083564453125e+02, 3.078927612304688e+02, 3.073807373046875e+02, 3.068224487304688e+02, 3.062200317382812e+02, 3.05575927734375e+02, 3.048926391601562e+02, 3.041728820800781e+02, 3.034194946289062e+02, 3.026354370117188e+02, 3.018237915039062e+02, 3.0098779296875e+02, 3.001307373046875e+02, 2.992560119628906e+02, 2.983670349121094e+02, 2.974673461914062e+02, 2.965604553222656e+02, 2.956499938964844e+02, 2.947395324707031e+02, 2.938326721191406e+02, 2.929329833984375e+02, 2.920440063476562e+02, 2.911692504882812e+02, 2.903121948242188e+02, 2.894761962890625e+02, 2.886645812988281e+02, 2.878805236816406e+02, 2.871271057128906e+02, 2.864073486328125e+02, 2.857240600585938e+02, 2.850799560546875e+02, 2.844775695800781e+02, 2.839192504882812e+02, 2.834072570800781e+02, 2.829435424804688e+02, 2.825299987792969e+02, 2.821682434082031e+02, 2.818596801757812e+02, 2.816055297851562e+02, 2.814068298339844e+02, 2.812643432617188e+02, 2.811786193847656e+02, 2.811499938964844e+02, 2.811786193847656e+02, 2.812643432617188e+02, 2.814068298339844e+02, 2.816055297851562e+02, 2.818596801757812e+02, 2.821682434082031e+02, 2.825299987792969e+02, 2.829435424804688e+02, 2.834072570800781e+02, 2.839192504882812e+02, 2.844775695800781e+02, 2.850799560546875e+02, 2.857240600585938e+02, 2.864073486328125e+02, 2.871271057128906e+02, 2.878805236816406e+02, 2.886645812988281e+02, 2.894761962890625e+02, 2.903121948242188e+02, 2.911692504882812e+02, 2.920440063476562e+02, 2.929329833984375e+02, 2.938326721191406e+02, 2.947395324707031e+02, 2.956499938964844e+02]
+opeModSel.TZonMin=[2.956499938964844e+02, 2.965604553222656e+02, 2.974673461914062e+02, 2.983670349121094e+02, 2.992560119628906e+02, 3.001307373046875e+02, 3.0098779296875e+02, 3.018237915039062e+02, 3.026354370117188e+02, 3.034194946289062e+02, 3.041728820800781e+02, 3.048926391601562e+02, 3.05575927734375e+02, 3.062200317382812e+02, 3.068224487304688e+02, 3.073807373046875e+02, 3.078927612304688e+02, 3.083564453125e+02, 3.087699890136719e+02, 3.091317443847656e+02, 3.094403076171875e+02, 3.096944580078125e+02, 3.098931579589844e+02, 3.100356750488281e+02, 3.101213989257812e+02, 3.101499938964844e+02, 3.101213989257812e+02, 3.100356750488281e+02, 3.098931579589844e+02, 3.096944580078125e+02, 3.094403076171875e+02, 3.091317443847656e+02, 3.087699890136719e+02, 3.083564453125e+02, 3.078927612304688e+02, 3.073807373046875e+02, 3.068224487304688e+02, 3.062200317382812e+02, 3.05575927734375e+02, 3.048926391601562e+02, 3.041728820800781e+02, 3.034194946289062e+02, 3.026354370117188e+02, 3.018237915039062e+02, 3.0098779296875e+02, 3.001307373046875e+02, 2.992560119628906e+02, 2.983670349121094e+02, 2.974673461914062e+02, 2.965604553222656e+02, 2.956499938964844e+02, 2.947395324707031e+02, 2.938326721191406e+02, 2.929329833984375e+02, 2.920440063476562e+02, 2.911692504882812e+02, 2.903121948242188e+02, 2.894761962890625e+02, 2.886645812988281e+02, 2.878805236816406e+02, 2.871271057128906e+02, 2.864073486328125e+02, 2.857240600585938e+02, 2.850799560546875e+02, 2.844775695800781e+02, 2.839192504882812e+02, 2.834072570800781e+02, 2.829435424804688e+02, 2.825299987792969e+02, 2.821682434082031e+02, 2.818596801757812e+02, 2.816055297851562e+02, 2.814068298339844e+02, 2.812643432617188e+02, 2.811786193847656e+02, 2.811499938964844e+02, 2.811786193847656e+02, 2.812643432617188e+02, 2.814068298339844e+02, 2.816055297851562e+02, 2.818596801757812e+02, 2.821682434082031e+02, 2.825299987792969e+02, 2.829435424804688e+02, 2.834072570800781e+02, 2.839192504882812e+02, 2.844775695800781e+02, 2.850799560546875e+02, 2.857240600585938e+02, 2.864073486328125e+02, 2.871271057128906e+02, 2.878805236816406e+02, 2.886645812988281e+02, 2.894761962890625e+02, 2.903121948242188e+02, 2.911692504882812e+02, 2.920440063476562e+02, 2.929329833984375e+02, 2.938326721191406e+02, 2.947395324707031e+02, 2.956499938964844e+02]
diff --git a/...Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos b/...Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos
@@ -3,5 +3,5 @@ createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.yOpeMod"}, range={
 createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.uOcc", "opeModSel.uHigOccCoo", "opeModSel.uOccHeaHig"}, range={0.0, 48.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="h");
 createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.tNexOcc"}, range={0.0, 48.0, -50000.0, 100000.0}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="h", displayUnits={"s"});
 createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.maxCooDowTim", "opeModSel.maxWarUpTim"}, range={0.0, 48.0, 1600.0, 2000.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, timeUnit="h", displayUnits={"s", "s"});
-createPlot(id=1, position={10, 10, 1450, 1400}, y={"TZonHeaSetUno.y", "TZonCooSetUno.y", "TZonHeaSetOcc.y", "TZonCooSetOcc.y", "opeModSel.TZonMax"}, range={0.0, 48.0, 280.0, 320.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="h", displayUnits={"", "", "", "", "K"});
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"TZonHeaSetUno.y", "TZonCooSetUno.y", "TZonHeaSetOcc.y", "TZonCooSetOcc.y", "opeModSel.TZonMin"}, range={0.0, 48.0, 280.0, 320.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="h", displayUnits={"", "", "", "", "K"});
 
diff --git a/...Vars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos b/...Vars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos
@@ -11,5 +11,5 @@ compareVars :=
     "TZonCooSetUno.y",
     "TZonHeaSetOcc.y",
     "TZonCooSetOcc.y",
-    "opeModSel.TZonMax"
+    "opeModSel.TZonMin"
   };
diff --git a/Buildings/package.mo b/Buildings/package.mo
@@ -296,6 +296,15 @@ The following <b style=\"color:red\">critical errors</b> have been fixed (i.e.,
 that can lead to wrong simulation results):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    </td>
+    <td valign=\"top\">Corrected input for enabling freeze protection setback mode.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue 3084</a>.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>Buildings.Examples</b>
     </td>
 </tr>