Merge branch 'master' into issue1495_clean_Mo2To_Interface

lbl-srg · Mar 11, 2024 · cb09d53 · cb09d53
2 parents 52b7601 + ab1e68a
commit cb09d53
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 264 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - [email protected]
     - OMC_VERSION=ubuntu-2204-omc:1.22.1-1
-    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4_rev-1
+    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.48.2
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024x-x86_64
     - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
     - ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64

diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo
@@ -65,8 +65,11 @@ protected
   Modelica.Blocks.Logical.Switch swi "Switch for temperature setpoint"
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
 
-  Modelica.Blocks.Sources.Constant zer(final k=-273.15)
-                                                  "Zero signal"
+  Modelica.Blocks.Sources.Constant zer(
+    final k(
+      unit="K",
+      displayUnit="degC") = 273.15)
+    "Zero signal, set to 0 degC which essentially switches off any heating"
     annotation (Placement(transformation(extent={{-100,-40},{-80,-20}})));
 
 initial equation
@@ -147,11 +150,18 @@ Model for an ideal heater that controls its outlet temperature to
 a prescribed outlet temperature with constant efficiency.
 </p>
 <p>
-The switch model <code>swi</code> is used to turn on/off the heater.
+The switch model <code>swi</code> is used to turn on/off the heater,
+which is accomplished by commanding it to heat the incoming fluid to <i>0</i>&deg;C.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+March 6, 2024, by Michael Wetter:<br/>
+Changed setpoint if component is off to avoid confusing result.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3681\">#3681</a>.
+</li>
+<li>
 April 14, 2020, by Michael Wetter:<br/>
 Changed <code>homotopyInitialization</code> to a constant.<br/>
 This is for

diff --git a/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo b/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo
diff --git a/Buildings/Controls/OBC/CDL/Logical/package.order b/Buildings/Controls/OBC/CDL/Logical/package.order
@@ -15,7 +15,6 @@ Switch
 Timer
 TimerAccumulating
 Toggle
-TriggeredTrapezoid
 TrueDelay
 TrueFalseHold
 TrueHoldWithReset

diff --git a/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo b/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo
@@ -218,11 +218,11 @@ Controller for balacing agents (i.e. reservoirs and plants) pump.
 </p>
 <p>
 This controller decides to turn on or off the agent pump depending on the current net demand of the
-district <code>if TRetDis > TSupDis cooling else heating </code> and the temperature differential 
+district <code>if TRetDis > TSupDis cooling else heating </code> and the temperature differential
 between the agent source temperature <code>TSou</code> and the agent inlet temperature <code>TSouIn</code>
 adjusted by the offset <code>dToff</code>. In particular the pump turns on : <code>if heating and TSou - TSouIn - dToff > 0</code>
-or <code>if cooling and TSouIn - Tsou - dToff > 0</code>. Then if the pump is turned on a PID controller, 
-by default used as P, controls the pump control input by using <code>TSouOut</code> as measurement and as setpoint 
+or <code>if cooling and TSouIn - Tsou - dToff > 0</code>. Then if the pump is turned on a PID controller,
+by default used as P, controls the pump control input by using <code>TSouOut</code> as measurement and as setpoint
 <code>TSou - dToff</code> for heating or <code>TSou + dToff</code> for cooling. <code>dToff</code> can be considered
 the nominal value of the agent heat exchanger pinch point temperature difference.
 </p>

diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo b/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo
@@ -263,13 +263,13 @@ equation
     Documentation(
       info="<html>
 <p>
-Example model of two one-pipe distribution models that could be used i.e for building a reservoir network to connect several agents in series. 
+Example model of two one-pipe distribution models that could be used i.e for building a reservoir network to connect several agents in series.
 It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipeAutoSize\">
 Buildings.Experimental.DHC.Networks.Distribution1PipeAutoSize</a> and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow\">
-Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow</a>. The distribution models create a vector of <code>nLoa</code> connection models 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\"> Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector 
+Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow</a>. The distribution models create a vector of <code>nLoa</code> connection models
+<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\"> Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector
 of <code>nLoa</code> agents made up by time series heating loads <a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release 
+Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release
 it to the same pipe.
 </p>
 </html>",

diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo b/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo
@@ -232,13 +232,13 @@ equation
     Documentation(
       info="<html>
 <p>
-Example model of two two-pipe distribution models that can be used i.e. for building a bi-directional network to connect several agents in series. 
-It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipeAutoSize\"> Buildings.Experimental.DHC.Networks.Distribution2PipeAutoSize</a> 
+Example model of two two-pipe distribution models that can be used i.e. for building a bi-directional network to connect several agents in series.
+It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipeAutoSize\"> Buildings.Experimental.DHC.Networks.Distribution2PipeAutoSize</a>
 and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow\"> Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow</a>.
  The distribution models create a vector of <code>nLoa</code> connection models <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\">
-Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads 
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\"> 
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe 
+Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads
+<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
+Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe
 and release it in the return pipe.
 </p>
 </html>",

diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo
@@ -140,7 +140,7 @@ edge (i.e., the input changes from true to false), the output is falling
 during <i>falling</i> to a value of <i>offset</i>.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TriggeredTrapezoid.png\"
+<img src=\"modelica://Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TriggeredTrapezoid.png\"
      alt=\"TriggeredTrapezoid.png\" />
 </p>
 <p>

diff --git a/...ls/OBC/CDL/Logical/TriggeredTrapezoid.png → ...ls/OBC/CDL/Logical/TriggeredTrapezoid.png b/...ls/OBC/CDL/Logical/TriggeredTrapezoid.png → ...ls/OBC/CDL/Logical/TriggeredTrapezoid.png
diff --git a/...ls/OBC/CDL/Logical/TriggeredTrapezoid.svg → ...ls/OBC/CDL/Logical/TriggeredTrapezoid.svg b/...ls/OBC/CDL/Logical/TriggeredTrapezoid.svg → ...ls/OBC/CDL/Logical/TriggeredTrapezoid.svg