Merge branch 'issue2019_VAV_MinOA' of https://github.com/lbl-srg/mode…

…lica-buildings into issue2028_dualMin
lbl-srg · Jul 10, 2020 · cb5f505 · cb5f505
2 parents 4d614d9 + 1db42bb
commit cb5f505
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 109 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo
@@ -76,7 +76,7 @@ block Controller
     "Type of controller"
     annotation (Dialog(group="Economizer PID controller"));
 
-  parameter Real kMinOut(final unit="1")=0.03
+  parameter Real kMinOut(final unit="1")=0.05
     "Gain of controller for minimum outdoor air intake"
     annotation (Dialog(group="Economizer PID controller"));
 
@@ -998,6 +998,12 @@ Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.SupplySignals
 revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 March 16, 2020, by Jianjun Hu:<br/>
 Reimplemented to add new block for specifying the minimum outdoor airfow setpoint.
 This new block avoids vector-valued calculations.<br/>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo
@@ -33,7 +33,7 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller" annotation (Dialog(group="Minimum outdoor air"));
 
-  parameter Real kMinOut(final unit="1")=0.1
+  parameter Real kMinOut(final unit="1")=0.05
     "Gain of controller for minimum outdoor air"
     annotation (Dialog(group="Minimum outdoor air"));
   parameter Real TiMinOut(
@@ -419,6 +419,12 @@ which may be revised in future versions, set
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 October 11, 2017, by Michael Wetter:<br/>
 Corrected implementation to use control loop signal as input.
 </li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo
@@ -17,7 +17,7 @@ block Limits
     annotation (Dialog(group="Controller"));
 
   parameter Real k(
-    final unit="1")=0.1 "Gain of damper limit controller"
+    final unit="1")=0.05 "Gain of damper limit controller"
     annotation (Dialog(group="Controller"));
 
   parameter Real Ti(
@@ -379,6 +379,13 @@ src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/AHUs/Mul
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.
+Set <code>yMin</code> to 0.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 March 14, 2020, by Jianjun Hu:<br/>
 Replaced mulAnd by logic and block to avoid vector-valued calculation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.

diff --git a/Buildings/Examples/VAVReheat/ASHRAE2006.mo b/Buildings/Examples/VAVReheat/ASHRAE2006.mo
@@ -405,11 +405,17 @@ ASHRAE, Atlanta, GA, 2006.
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed design and control parameters for outdoor air flow.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>
+</li>
+<li>
 April 20, 2020, by Jianjun Hu:<br/>
 Exported actual VAV damper position as the measured input data for
 defining duct static pressure setpoint.<br/>
 This is
-for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">issue #1873</a>
+for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
 </li>
 <li>
 May 19, 2016, by Michael Wetter:<br/>
@@ -443,9 +449,5 @@ This is for
     __Dymola_Commands(file=
           "modelica://Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/ASHRAE2006.mos"
         "Simulate and plot"),
-    experiment(
-      StartTime=15552000,
-      StopTime=15724800,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Cvode"));
+    experiment(StopTime=172800, Tolerance=1e-06));
 end ASHRAE2006;
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo b/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo
@@ -926,6 +926,12 @@ shading devices, Technical Report, Oct. 17, 2006.
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Added design parameters for outdoor air flow.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>
+</li>
+<li>
 September 26, 2017, by Michael Wetter:<br/>
 Separated physical model from control to facilitate implementation of alternate control
 sequences.

diff --git a/Buildings/Examples/VAVReheat/Controls/Economizer.mo b/Buildings/Examples/VAVReheat/Controls/Economizer.mo
@@ -260,6 +260,15 @@ air requirement and an override for freeze protection.
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Added optional reset signal.
+Corrected connections to <code>yOATFre</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>
+and
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1995\">#1995</a>.
+</li>
+<li>
 December 20, 2016, by Michael Wetter:<br/>
 Added type conversion for enumeration when used as an array index.<br/>
 This is for

diff --git a/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo b/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo
@@ -135,6 +135,12 @@ measurement error in a real application.
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Added optional reset signal.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 April 1, 2016, by Michael Wetter:<br/>
 Added hysteresis to avoid too many events that stall the simulation.
 This is for

diff --git a/Buildings/Examples/VAVReheat/Guideline36.mo b/Buildings/Examples/VAVReheat/Guideline36.mo
@@ -88,6 +88,7 @@ model Guideline36
     "Replicate real input"
     annotation (Placement(transformation(extent={{-120,320},{-100,340}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Controller conAHU(
+    kMinOut=0.03,
     final pMaxSet=410,
     final yFanMin=yFanMin,
     final VPriSysMax_flow=VPriSysMax_flow,
@@ -456,6 +457,12 @@ its input.
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed design and control parameters for outdoor air flow.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>
+</li>
+<li>
 April 20, 2020, by Jianjun Hu:<br/>
 Exported actual VAV damper position as the measured input data for terminal controller.<br/>
 This is