Merge branch 'master' into issue1880_moverEfficiencyFixAndValidationR…

…ework
ibpsa · Jun 19, 2024 · 670a1db · 670a1db
2 parents c3b5fe9 + b794181
commit 670a1db
Show file tree

Hide file tree

Showing 157 changed files with 41,143 additions and 292 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - [email protected]
     - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024x-x86_64
+    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
 
   jobs:
     # Test matrix for regression tests.

diff --git a/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo b/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo
@@ -8,7 +8,10 @@ model NumberOfRequests
     kind=0) annotation (Placement(transformation(extent={{0,20},{20,40}})));
   Modelica.Blocks.Sources.Sine sine(f=2)
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Modelica.Blocks.Sources.Pulse pulse(period=0.35)
+  Modelica.Blocks.Sources.Pulse pulse(
+    amplitude=1-pulse.offset,
+    period=0.35,
+    offset=-0.01)
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
 equation
   connect(sine.y, numReq.u[1]) annotation (Line(points={{-39,-10},{-19.5,-10},{
@@ -21,6 +24,12 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Controls/Conti
     Documentation(revisions="<html>
 <ul>
 <li>
+June 16, 2024, by Hongxiang Fu:<br/>
+Changed pulse input from 0 to 1 to 0.01 to 1.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1897\">#1897</a>.
+</li>
+<li>
 January 12, 2017, by Thierry S. Nouidui:<br/>
 Modified example to prevent simultaneous events
 This is for

diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
@@ -60,7 +60,7 @@ The <code>MixingVolume</code> <code>Medium</code> parameter contains information
 the type of fluid and its properties that should be modelled by the <code>MixingVolume</code>.
 Set its value to <code>MediumAir</code>, which is declared in the template,
 by typing <code>redeclare package Medium = MediumAir</code>.
-For the nominal mass flow rate you may assume a value of <i>1 kg/m<sup>3</sup></i> for now.
+For the nominal mass flow rate you may assume a value of <i>1 kg/s</i> for now.
 You will have to change this value once you add a ventilation system to the model (see
 <a href=\"modelica://IBPSA.Examples.Tutorial.SimpleHouse.SimpleHouse6\">
 IBPSA.Examples.Tutorial.SimpleHouse.SimpleHouse6</a>).

diff --git a/...d/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo b/...d/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo
@@ -18,7 +18,6 @@ model InternalHEXTwoUTube
     dp2_nominal=10,
     dp3_nominal=10,
     dp4_nominal=10,
-    dynFil=true,
     borFieDat=borFieDat,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     TGro_start(displayUnit="K") = 285.15,
@@ -120,8 +119,14 @@ This example simulates the interior thermal behavior of a double U-tube borehole
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source FixedBoundary with Boundary_pT. This is for 
+Replaced fluid source FixedBoundary with Boundary_pT. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
@@ -56,7 +56,6 @@ public
 
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube
     intResUTub(
-      dynFil=dynFil,
       hSeg=hSeg,
       energyDynamics=energyDynamics,
       Rgb_val=Rgb_val,
@@ -160,6 +159,12 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<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/>

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
@@ -104,7 +104,6 @@ model InternalHEXTwoUTube
     Rgg1_val=Rgg1_val,
     Rgg2_val=Rgg2_val,
     RCondGro_val=RCondGro_val,
-    dynFil=dynFil,
     energyDynamics=energyDynamics,
     T_start=TGro_start)
                    "Internal resistances for a double U-tube configuration"
@@ -254,6 +253,12 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<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/>

diff --git a/...id/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo b/...id/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo
@@ -25,7 +25,7 @@ model InternalResistancesOneUTube
     C=Co_fil/2,
     T(start=T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
     der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)))
-    if dynFil
+    if not borFieDat.filDat.steadyState
     "Heat capacity of the filling material" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
@@ -35,7 +35,7 @@ model InternalResistancesOneUTube
     C=Co_fil/2,
     T(start=T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
     der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)))
-    if dynFil
+    if not borFieDat.filDat.steadyState
     "Heat capacity of the filling material" annotation (Placement(
         transformation(
         extent={{-10,10},{10,-10}},
@@ -83,16 +83,16 @@ equation
     Documentation(info="<html>
 <p>
 This model simulates the internal thermal resistance network of a borehole segment in
-the case of a single U-tube borehole using the method of Bauer et al. (2011) 
-and computing explicitely the fluid-to-ground thermal resistance 
-<i>R<sub>b</sub></i> and the 
+the case of a single U-tube borehole using the method of Bauer et al. (2011)
+and computing explicitely the fluid-to-ground thermal resistance
+<i>R<sub>b</sub></i> and the
 grout-to-grout resistance
 <i>R<sub>a</sub></i> as defined by Claesson and Hellstrom (2011)
-using the multipole method. 
+using the multipole method.
 </p>
 <h4>References</h4>
-<p>J. Claesson and G. Hellstrom. 
-<i>Multipole method to calculate borehole thermal resistances in a borehole heat exchanger. 
+<p>J. Claesson and G. Hellstrom.
+<i>Multipole method to calculate borehole thermal resistances in a borehole heat exchanger.
 </i>
 HVAC&amp;R Research,
 17(6): 895-911, 2011.</p>
@@ -106,6 +106,12 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 July 5, 2018, by Alex Laferri&egrave;re:<br/>
 Extended the model from a partial class.
 </li>

diff --git a/...id/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo b/...id/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo
@@ -8,9 +8,10 @@ model InternalResistancesTwoUTube
     "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)";
   parameter Modelica.Units.SI.ThermalResistance Rgg2_val
     "Thermal resistance between two  grout capacities opposite to each other, as defined by Bauer et al (2010)";
-  parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*
-      borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi*(borFieDat.conDat.rBor^2
-       - 4*borFieDat.conDat.rTub^2)
+  parameter Modelica.Units.SI.HeatCapacity Co_fil=
+     if borFieDat.filDat.steadyState then 0
+     else borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi*
+          (borFieDat.conDat.rBor^2 - 4*borFieDat.conDat.rTub^2)
     "Heat capacity of the whole filling material";
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_3
@@ -92,29 +93,29 @@ model InternalResistancesTwoUTube
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor capFil1(T(start=
           T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
       der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)),
-    C=Co_fil/4)  if dynFil "Heat capacity of the filling material"
+    C=Co_fil/4)  if not borFieDat.filDat.steadyState "Heat capacity of the filling material"
                                             annotation (Placement(transformation(extent={{-8,-8},
             {8,8}},
         rotation=90,
         origin={-22,64})));
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor capFil2(T(start=
           T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
       der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)),
-    C=Co_fil/4)  if dynFil "Heat capacity of the filling material"
+    C=Co_fil/4)  if not borFieDat.filDat.steadyState "Heat capacity of the filling material"
                                             annotation (Placement(transformation(extent={{58,8},{
             74,24}})));
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor capFil3(T(start=
           T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
       der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)),
-    C=Co_fil/4)  if dynFil "Heat capacity of the filling material"
+    C=Co_fil/4)  if not borFieDat.filDat.steadyState "Heat capacity of the filling material"
                                             annotation (Placement(transformation(extent={{-8,-8},
             {8,8}},
         rotation=90,
         origin={-26,-62})));
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor capFil4(T(start=
           T_start, fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial)),
       der_T(fixed=(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial)),
-    C=Co_fil/4)  if dynFil "Heat capacity of the filling material"
+    C=Co_fil/4)  if not borFieDat.filDat.steadyState "Heat capacity of the filling material"
                                             annotation (Placement(transformation(extent={{-82,20},
             {-66,36}})));
 equation
@@ -220,16 +221,16 @@ equation
         Documentation(info="<html>
 <p>
 This model simulates the internal thermal resistance network of a borehole segment in
-the case of a double U-tube borehole using the method of Bauer et al. (2011) 
-and computing explicitely the fluid-to-ground thermal resistance 
-<i>R<sub>b</sub></i> and the 
+the case of a double U-tube borehole using the method of Bauer et al. (2011)
+and computing explicitely the fluid-to-ground thermal resistance
+<i>R<sub>b</sub></i> and the
 grout-to-grout resistance
 <i>R<sub>a</sub></i> as defined by Claesson and Hellstrom (2011)
-using the multipole method. 
+using the multipole method.
 </p>
 <h4>References</h4>
-<p>J. Claesson and G. Hellstrom. 
-<i>Multipole method to calculate borehole thermal resistances in a borehole heat exchanger. 
+<p>J. Claesson and G. Hellstrom.
+<i>Multipole method to calculate borehole thermal resistances in a borehole heat exchanger.
 </i>
 HVAC&amp;R Research,
 17(6): 895-911, 2011.</p>
@@ -243,6 +244,12 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 July 5, 2018, by Alex Laferri&egrave;re:<br/>
 Extended the model from a partial class.
 </li>

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo
@@ -37,9 +37,6 @@ partial model PartialBorehole
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
 
-  parameter Boolean dynFil=true
-      "Set to false to remove the dynamics of the filling material"
-      annotation (Dialog(tab="Dynamics"));
   parameter Data.Borefield.Template borFieDat "Borefield parameters"
     annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
 
@@ -55,6 +52,12 @@ as several borehole segments, with a uniform borehole wall boundary condition.
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to water and glycolWater.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo
@@ -15,9 +15,7 @@ partial model PartialInternalHEX
               "Propylene glycol water, 40% mass fraction")));
   constant Real mSenFac=1
     "Factor for scaling the sensible thermal mass of the volume";
-  parameter Boolean dynFil=true
-    "Set to false to remove the dynamics of the filling material"
-    annotation (Dialog(tab="Dynamics"));
+
   parameter Modelica.Units.SI.Length hSeg
     "Length of the internal heat exchanger";
   parameter Modelica.Units.SI.Volume VTubSeg=hSeg*Modelica.Constants.pi*(
@@ -90,6 +88,12 @@ need to be declared in models which extend this partial model:
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to water and glycolWater.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.

diff --git a/...uid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo b/...uid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo
@@ -14,9 +14,6 @@ partial model PartialInternalResistances
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
-  parameter Boolean dynFil=true
-      "Set to false to remove the dynamics of the filling material."
-      annotation (Dialog(tab="Dynamics"));
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_1
     "Thermal connection for pipe 1"
@@ -27,6 +24,7 @@ partial model PartialInternalResistances
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_2
     "Thermal connection for borehole wall"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
+
   annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
         Rectangle(
           extent={{-100,100},{100,-100}},
@@ -64,6 +62,12 @@ segment).
 </html>", revisions="<html>
 <ul>
 <li>
+May 17, 2024, by Michael Wetter:<br/>
+Updated model due to removal of parameter <code>dynFil</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+</li>
+<li>
 July 5, 2018, by Alex Laferri&egrave;re:<br/>
 First implementation of partial class.
 </li>