merged master

lbl-srg · Sep 21, 2023 · 5fef24b · 5fef24b
2 parents 0809e92 + 46042ba
commit 5fef24b
Show file tree

Hide file tree

Showing 120 changed files with 1,887 additions and 462 deletions.
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
@@ -747,6 +747,19 @@ Buildings/Electrical/Utilities/package.mo
 Buildings/Electrical/Utilities/package.order
 Buildings/Electrical/package.mo
 Buildings/Electrical/package.order
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo
+Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
+Buildings/Examples/Tutorial/SimpleHouse/package.mo
+Buildings/Examples/Tutorial/SimpleHouse/package.order
+Buildings/Examples/Tutorial/package.mo
+Buildings/Examples/Tutorial/package.order
+Buildings/Examples/package.mo
+Buildings/Examples/package.order
 Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
 Buildings/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mo
 Buildings/Fluid/Actuators/BaseClasses/Examples/package.mo
@@ -1743,6 +1756,7 @@ Buildings/Fluid/Storage/BaseClasses/Examples/package.mo
 Buildings/Fluid/Storage/BaseClasses/Examples/package.order
 Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
 Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
+Buildings/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
 Buildings/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo
 Buildings/Fluid/Storage/BaseClasses/package.mo
 Buildings/Fluid/Storage/BaseClasses/package.order
@@ -2009,6 +2023,17 @@ Buildings/Resources/Images/Electrical/Transmission/Grids/testGrid2Nodes.svg
 Buildings/Resources/Images/Electrical/UsersGuide/2014-BauSim-BonviniWetterNouidui.pdf
 Buildings/Resources/Images/Electrical/UsersGuide/nonlinearEq.png
 Buildings/Resources/Images/Electrical/Utilities/Examples/VoltCTRL.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/airModel.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/heatingControllerModel.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result1.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result2.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result3.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result4.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result5.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result6.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/result7.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/simpleHouse.png
+Buildings/Resources/Images/Examples/Tutorial/SimpleHouse/simulate.png
 Buildings/Resources/Images/Fluid/Actuators/Valves/Examples/TwoWayButterfly.png
 Buildings/Resources/Images/Fluid/Actuators/Valves/Examples/TwoWayValveTable_kv.png
 Buildings/Resources/Images/Fluid/Actuators/threeWayValvePressureDropSeries.png
@@ -2330,6 +2355,13 @@ Buildings/Resources/Scripts/Dymola/Electrical/DC/Sources/Examples/VoltageSource.
 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos
 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos
 Buildings/Resources/Scripts/Dymola/Electrical/Utilities/Examples/TestVoltageCTRL.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse0.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse1.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse2.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse3.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse4.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse5.mos
+Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse6.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos
@@ -2705,6 +2737,7 @@ Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoom
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElementsNonConstantTGround.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomSteadyState.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos
@@ -2866,6 +2899,7 @@ Buildings/ThermalZones/ISO13790/Zone5R1C/package.order
 Buildings/ThermalZones/ISO13790/package.mo
 Buildings/ThermalZones/ISO13790/package.order
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo
+Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/SourceSelector.mo
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/package.mo
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/package.order
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007.mo
@@ -2877,6 +2911,7 @@ Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstanc
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mo
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mo
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mo
+Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElementsNonConstantTGround.mo
 Buildings/ThermalZones/ReducedOrder/Examples/package.mo
 Buildings/ThermalZones/ReducedOrder/Examples/package.order
 Buildings/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo

diff --git a/...C/CDL/Discrete/Examples/FirstOrderHold.mo → ...CDL/Discrete/Validation/FirstOrderHold.mo b/...C/CDL/Discrete/Examples/FirstOrderHold.mo → ...CDL/Discrete/Validation/FirstOrderHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model FirstOrderHold
   "Example model for the FirstOrderHold block"
   Buildings.Controls.OBC.CDL.Discrete.FirstOrderHold firOrdHol(
@@ -17,15 +17,15 @@ model FirstOrderHold
 
 equation
   connect(ramp1.y,cos1.u)
-    annotation (Line(points={{-39,0},{-12,0},{-12,0}},color={0,0,127}));
+    annotation (Line(points={{-38,0},{-12,0},{-12,0}},color={0,0,127}));
   connect(cos1.y,firOrdHol.u)
-    annotation (Line(points={{11,0},{20,0},{28,0}},color={0,0,127}));
+    annotation (Line(points={{12,0},{12,0},{28,0}},color={0,0,127}));
   annotation (
     experiment(
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/FirstOrderHold.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/FirstOrderHold.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...rols/OBC/CDL/Discrete/Examples/Sampler.mo → ...ls/OBC/CDL/Discrete/Validation/Sampler.mo b/...rols/OBC/CDL/Discrete/Examples/Sampler.mo → ...ls/OBC/CDL/Discrete/Validation/Sampler.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model Sampler
   "Example model for the Sampler block"
   Buildings.Controls.OBC.CDL.Discrete.Sampler sampler1(
@@ -25,7 +25,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/Sampler.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/Sampler.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...OBC/CDL/Discrete/Examples/TriggeredMax.mo → ...C/CDL/Discrete/Validation/TriggeredMax.mo b/...OBC/CDL/Discrete/Examples/TriggeredMax.mo → ...C/CDL/Discrete/Validation/TriggeredMax.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model TriggeredMax
   "Example model for the TriggeredMax block"
   Buildings.Controls.OBC.CDL.Discrete.TriggeredMax triggeredMax
@@ -31,7 +31,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/TriggeredMax.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/TriggeredMax.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/.../Discrete/Examples/TriggeredMovingMean.mo → ...iscrete/Validation/TriggeredMovingMean.mo b/.../Discrete/Examples/TriggeredMovingMean.mo → ...iscrete/Validation/TriggeredMovingMean.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model TriggeredMovingMean
   "Validation model for the TriggeredMovingMean block"
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin(
@@ -50,7 +50,7 @@ equation
       StopTime=15.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/TriggeredMovingMean.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...CDL/Discrete/Examples/TriggeredSampler.mo → ...L/Discrete/Validation/TriggeredSampler.mo b/...CDL/Discrete/Examples/TriggeredSampler.mo → ...L/Discrete/Validation/TriggeredSampler.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model TriggeredSampler
   "Example model for the TriggeredSampler block"
   Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1(
@@ -39,7 +39,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/TriggeredSampler.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/TriggeredSampler.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...ls/OBC/CDL/Discrete/Examples/UnitDelay.mo → .../OBC/CDL/Discrete/Validation/UnitDelay.mo b/...ls/OBC/CDL/Discrete/Examples/UnitDelay.mo → .../OBC/CDL/Discrete/Validation/UnitDelay.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model UnitDelay
   "Example model for the UnitDelay block"
   Buildings.Controls.OBC.CDL.Discrete.UnitDelay unitDelay1(
@@ -25,7 +25,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/UnitDelay.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/UnitDelay.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...BC/CDL/Discrete/Examples/ZeroOrderHold.mo → .../CDL/Discrete/Validation/ZeroOrderHold.mo b/...BC/CDL/Discrete/Examples/ZeroOrderHold.mo → .../CDL/Discrete/Validation/ZeroOrderHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Discrete.Examples;
+within Buildings.Controls.OBC.CDL.Discrete.Validation;
 model ZeroOrderHold
   "Example model for the ZeroOrderHold block"
   Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol(
@@ -25,7 +25,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Examples/ZeroOrderHold.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Discrete/Validation/ZeroOrderHold.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>

diff --git a/...rols/OBC/CDL/Discrete/Examples/package.mo → ...ls/OBC/CDL/Discrete/Validation/package.mo b/...rols/OBC/CDL/Discrete/Examples/package.mo → ...ls/OBC/CDL/Discrete/Validation/package.mo
@@ -1,14 +1,23 @@
 within Buildings.Controls.OBC.CDL.Discrete;
-package Examples "Collection of models that illustrate model use and test models"
+package Validation "Collection of models that validate the discrete blocks of the CDL"
   annotation (
     preferredView="info",
     Documentation(
       info="<html>
 <p>
-This package contains examples for the use of models that can be found in
+This package contains models that validate the blocks in
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Discrete\">
 Buildings.Controls.OBC.CDL.Discrete</a>.
 </p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+September 13, 2023, by Jianjun Hu:<br/>
+Changed the package name from <code>Examples</code> to <code>Validation</code>.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3517\">issue 3517</a>.
+</li>
+</ul>
 </html>"),
     Icon(
       graphics={
@@ -29,4 +38,4 @@ Buildings.Controls.OBC.CDL.Discrete</a>.
           pattern=LinePattern.None,
           fillPattern=FillPattern.Solid,
           points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}));
-end Examples;
+end Validation;
diff --git a/...s/OBC/CDL/Discrete/Examples/package.order → ...OBC/CDL/Discrete/Validation/package.order b/...s/OBC/CDL/Discrete/Examples/package.order → ...OBC/CDL/Discrete/Validation/package.order
diff --git a/Buildings/Controls/OBC/CDL/Discrete/package.order b/Buildings/Controls/OBC/CDL/Discrete/package.order
@@ -5,4 +5,4 @@ TriggeredMovingMean
 TriggeredSampler
 UnitDelay
 ZeroOrderHold
-Examples
+Validation