Merge branch 'master' into issue2293_chiller_plant_seq

lbl-srg · Jan 25, 2024 · f1db6da · f1db6da
2 parents e9ae31a + 9c5d528
commit f1db6da
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 24 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo
@@ -479,7 +479,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo
@@ -657,7 +657,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/...ontrols/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo b/...ontrols/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo
@@ -519,7 +519,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/...gs/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo b/...gs/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo
@@ -657,7 +657,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo
@@ -859,7 +859,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo
@@ -970,7 +970,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo
@@ -949,7 +949,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo
@@ -819,7 +819,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo
@@ -950,7 +950,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo
@@ -949,7 +949,7 @@ This is for
 </li>
 <li>
 August 23, 2023, by Jianjun Hu:<br/>
-Added delay <code>staTim</code> to allow the system becoming stablized.
+Added delay <code>staTim</code> to allow the system becoming stabilized.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
 </li>
 <li>

diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/UsersGuide.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/UsersGuide.mo
@@ -476,21 +476,14 @@ in the same way as a conventional EnergyPlus simulation.
 </li>
 <li>
 <p>
-The first day of the simulation is repeated until the minimum and maximum air temperatures
-during the warmup day remain nearly the same between two successive iterations.
+The first day of the simulation is repeated, but Spawn uses a different criteria for stopping
+the iteration compared to a conventional EnergyPlus simulation. In EnergyPlus, the first day is repeated
+until the zone air temperature reaches a periodic steady state as indicated by the minimum and maximum temperatures
+for the warmup day stablizing. In Spawn, the exit criteria is similarly based on reaching a periodic steady state,
+however Spawn exits warmup when the surface temperatures stabilize instead of the air temperature.
 </p>
 </li>
 </ol>
-<p>
-The Spawn warmup procedure is still invoked even if there are no unconnected zones defined in the model.
-However, in this case the warmup convergence criteria will be met after only two iterations of the warmup day
-because all zone temperature and humidity values are fixed to the initial values defined in Modelica.
-It is possible for startup transients to still exist after Spawn warmup due thermal mass
-in the wall materials not being fully exposed to the surface boundary conditions
-defined by the outdoor environment and the initial zone air conditions.
-A future enhancement may define a new warmup convergence criteria that takes into account
-the internal wall temperatures.
-</p>
 </html>"));
   end EnergyPlusWarmUp;
 
@@ -616,4 +609,4 @@ Created User's guide.
 </li>
 </ul>
 </html>"));
-end UsersGuide;
+end UsersGuide;
diff --git a/Buildings/package.mo b/Buildings/package.mo
@@ -899,7 +899,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
                        Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms
     </td>
-    <td valign=\"top\">Added delay triggering alarms after enabling AHU supply fan, to allow the system becoming stablized.<br/>
+    <td valign=\"top\">Added delay triggering alarms after enabling AHU supply fan, to allow the system becoming stabilized.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
     </td>
 </tr>