Merge IBPSA master

lbl-srg · Apr 14, 2020 · d0598e1 · d0598e1
1 parent c4af220
commit d0598e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/Continuous/Examples/LimPIDWithReset.mos b/Buildings/Resources/Scripts/Dymola/Controls/Continuous/Examples/LimPIDWithReset.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.Continuous.Examples.LimPIDWithReset", stopTime=600, numberOfIntervals=5000, method="Cvode", tolerance=1e-06, resultFile="CDL_LimPIDWithReset");
+simulateModel("Buildings.Controls.Continuous.Examples.LimPIDWithReset", stopTime=600, numberOfIntervals=5000, method="Cvode", tolerance=1e-06, resultFile="LimPIDWithReset");
 createPlot(id=2, position={45, 48, 611, 783}, y={"TSet.y", "plaWitRes.temSen.T", "plaNoRes.temSen.T"}, range={0.0, 3600.0, 270.0, 390.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={45, 48, 611, 389}, y={"conWitRes.conPID.trigger"}, range={0.0, 3600.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=3, position={693, 51, 1049, 782}, y={"conWitRes.conPID.controlError", "conNoRes.conPID.controlError"}, range={0.0, 3600.0, -80.0, 40.0}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/...dings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos b/...dings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset", stopTime=10, method="Cvode", tolerance=1e-06, resultFile="LimPIDWithReset");
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset", stopTime=10, method="Cvode", tolerance=1e-06, resultFile="CDL_LimPIDWithReset");
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDPar.u_s", "limPIDPar.u_m", "limPIDPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDInp.u_s", "limPIDInp.u_m", "limPIDInp.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIPar.u_s", "limPIPar.u_m", "limPIPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});

diff --git a/Buildings/Types/Azimuth/package.mo b/Buildings/Types/Azimuth/package.mo
@@ -19,13 +19,13 @@ package Azimuth "List of possible constant values for surface azimuth"
    constant Modelica.SIunits.Angle SE = -Modelica.Constants.pi/4
   "Azimuth for an exterior wall whose outer surface faces south-east";
 
-  annotation(preferredView="info",
+annotation(preferredView="info",
 Documentation(info="<html>
 <p>
-Possible constant values to define the azimuth of a surface.
+Collection of constant values to define the azimuth of a surface.
 For example, if an exterior wall is South oriented, i.e., its outside-facing
 surface is towards South, use
- <code>Buildings.Types.Azimuth.S</code>.
+<code>Buildings.Types.Azimuth.S</code>.
 </p>
 <p>
 See also
@@ -34,7 +34,7 @@ Buildings.BoundaryConditions.UsersGuide</a>
 for explanations of the azimuth.
 </p>
 </html>",
-  revisions="<html>
+revisions="<html>
 <ul>
 <li>
 November 30 2010, by Michael Wetter:<br/>