Merge branch 'master' into issue3538_Air2Air_recovery

lbl-srg · Nov 27, 2023 · 04c4078 · 04c4078
2 parents 9ad06bf + 4e82105
commit 04c4078
Show file tree

Hide file tree

Showing 66 changed files with 513 additions and 318 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ services:
 
 env:
   global:
+    - DOCKER_REPONAME=lbnlblum
     - [email protected]
     - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4
@@ -113,11 +114,11 @@ env:
 before_install:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
-       docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION};
+       docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION};
        cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
     fi;
   - if [[ "$TEST_ARG" == *test-optimica* ]]; then
-       docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION};
+       docker pull "$DOCKER_REPONAME"/${OPTIMICA_VERSION};
        cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
     fi;
 # The Spawn idf reference results are generated with EnergyPlus 9.6.0,
@@ -144,7 +145,7 @@ before_install:
       echo "Installed modelica-json in ${MODELICA_JSON_HOME}";
     fi;
   - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then
-       docker pull "$DOCKER_USERNAME"/${OMC_VERSION};
+       docker pull lbnlblum/${OMC_VERSION};
        cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
     fi;
 

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
@@ -102,7 +102,8 @@ partial model PartialMultiplePumps
     final per=per,
     addPowerToMedium=false) "Pump"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  MultipleCommands com(final nUni=nPum) "Convert command signal"
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nPum)
+    "Convert command signal"
     annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
 
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
@@ -241,15 +242,15 @@ equation
 <p>
 This base class represents multiple identical pumps that are piped in parallel.
 An optional check valve in series with each pump is included.
-This class is used to construct the various multiple-pump models within 
+This class is used to construct the various multiple-pump models within
 <a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
 Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
 </p>
 <h4>Details</h4>
 <p>
 In a parallel arrangement, all operating units have the same operating point.
 This allows modeling the multiple pumps with a single instance of any
-class derived from 
+class derived from
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine\">
 Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</a>.
 Hydronics are resolved with mass flow rate multiplier components.

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
@@ -1,4 +1,3 @@
-MultipleCommands
 MultipleValves
 PartialMultiplePumps
 PassThroughFluid
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
@@ -192,7 +192,7 @@ model ChillerGroup
     final use_input=true)
     "Flow rate multiplier"
     annotation (Placement(transformation(extent={{-30,-70},{-50,-50}})));
-  BaseClasses.MultipleCommands com(
+  Buildings.Templates.Components.Controls.MultipleCommands com(
     final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-80,110},{-60,130}})));

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
@@ -93,7 +93,7 @@ model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
     final use_input=false,
     final k=nUni)         "Flow rate multiplier"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  BaseClasses.MultipleCommands com(final nUni=nUni)
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
@@ -222,15 +222,15 @@ The following input and output points are available.
 </p>
 <ul>
 <li>
-Start command (VFD Run) <code>y1</code>: 
+Start command (VFD Run) <code>y1</code>:
 DO signal dedicated to each unit, with a dimensionality of one
 </li>
 <li>
 Speed command <code>y</code>:
 AO signal common to all units, with a dimensionality of zero
 </li>
 <li>
-CW supply temperature <code>TConWatSup</code>: 
+CW supply temperature <code>TConWatSup</code>:
 AI signal common to all units, with a dimensionality of zero
 </li>
 </ul>

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
@@ -108,7 +108,7 @@ model HeatPumpGroup
     final use_input=true)
     "Flow rate multiplier"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  BaseClasses.MultipleCommands com(final nUni=nUni)
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"

diff --git a/...lds/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo b/...lds/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
@@ -57,7 +57,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -75,6 +76,13 @@ borehole.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/...Classes/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo b/...Classes/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo
@@ -56,7 +56,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -79,6 +80,13 @@ capacity location <code>x</code> is then automatically set to zero.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/...lds/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo b/...lds/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo
@@ -58,7 +58,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -76,6 +77,13 @@ borehole.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/...Classes/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo b/...Classes/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo
@@ -58,7 +58,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -81,6 +82,13 @@ capacity location <code>x</code> is then automatically set to zero.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/...mal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo b/...mal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo
@@ -81,7 +81,7 @@ algorithm
       i := i + 1;
     end while;
   end if;
-  assert(test, "In " + getInstanceName() + ":\n" +
+  assert(test, "In " + instanceName + ":\n" +
   "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function
@@ -121,6 +121,13 @@ International Journal of Energy Research, 35:312&ndash;320, 2011.</p>
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 February 7, 2022, by Michael Wetter:<br/>
 Changed function to be <code>pure</code>.<br/>
 This is for

diff --git a/...mal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo b/...mal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo
@@ -88,7 +88,7 @@ algorithm
       i := i + 1;
     end while;
   end if;
-  assert(test, "In " + getInstanceName() + ":\n" +
+  assert(test, "In " + instanceName + ":\n" +
   "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function
@@ -129,6 +129,13 @@ International Journal of Energy Research, 35:312&ndash;320, 2011.</p>
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 February 7, 2022, by Michael Wetter:<br/>
 Changed function to be <code>pure</code>.<br/>
 This is for

diff --git a/...rmal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo b/...rmal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
@@ -29,6 +29,8 @@ partial function partialInternalResistances
   input Modelica.Units.SI.SpecificHeatCapacity cpMed
     "Specific heat capacity of the fluid";
   input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  input String instanceName="undeclared caller"
+    "Instance name of the model or block that calls this function";
 
   // Outputs
   output Real x "Capacity location";
@@ -71,6 +73,13 @@ the borehole internal resistances.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 4, 2023, by Michael Wetter:<br/>
 Corrected variability.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1762\">IBPSA, #1762</a>.

diff --git a/...ings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo b/...ings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
@@ -92,7 +92,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m1_flow_nominal);
+      m_flow_nominal=m1_flow_nominal,
+      instanceName=getInstanceName());
 
 equation
     assert(borFieDat.conDat.borCon == Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.SingleUTube,
@@ -159,6 +160,13 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Removed <code>massDynamics</code>.<br/>
 This is for

diff --git a/...ings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo b/...ings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
@@ -153,7 +153,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m1_flow_nominal);
+      m_flow_nominal=m1_flow_nominal,
+      instanceName=getInstanceName());
 
 equation
   assert(borFieDat.conDat.borCon == Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel
@@ -253,6 +254,13 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Removed <code>massDynamics</code>.<br/>
 This is for

diff --git a/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo b/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo
@@ -102,7 +102,7 @@ The heat exchanger effectiveness is calculated from the number of transfer units
 (NTU):
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-&epsilon; = 1 - exp(UA &frasl; (m&#775; c<sub>p</sub>))
+&epsilon; = 1 - exp(- UA &frasl; (m&#775; c<sub>p</sub>))
 </p>
 <p>
 Optionally, this model can have a flow resistance.