Removed parameter dynFil

This is for 1885
ibpsa · May 17, 2024 · 68e1fa5 · 68e1fa5
1 parent ab8b702
commit 68e1fa5
Show file tree

Hide file tree

Showing 14 changed files with 135 additions and 69 deletions.
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>

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo
@@ -14,7 +14,6 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
     borFieDat=borFieUTubDat,
     m_flow_nominal=borFieUTubDat.conDat.mBor_flow_nominal,
     dp_nominal=borFieUTubDat.conDat.dp_nominal,
-    dynFil=true,
     nSeg=nSeg,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     TGro_start = {T_start for i in 1:nSeg},
@@ -43,7 +42,7 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
   parameter
     IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example
     borFieUTubDat "Borefield parameters with UTube borehole configuration"
-    annotation (Placement(transformation(extent={{80,20},{100,40}})));
+    annotation (Placement(transformation(extent={{90,40},{110,60}})));
   IBPSA.Fluid.Sensors.TemperatureTwoPort TBorIn(m_flow_nominal=borFieUTubDat.conDat.mBor_flow_nominal,
     redeclare package Medium = Medium,
     tau=0)
@@ -68,10 +67,9 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
         origin={-98,90})));
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube borHolOneUTubSteSta(
     redeclare package Medium = Medium,
-    borFieDat=borFieUTubDat,
-    m_flow_nominal=borFieUTubDat.conDat.mBor_flow_nominal,
-    dp_nominal=borFieUTubDat.conDat.dp_nominal,
-    dynFil=false,
+    borFieDat=borFieUTubDatSteSta,
+    m_flow_nominal=borFieUTubDatSteSta.conDat.mBor_flow_nominal,
+    dp_nominal=borFieUTubDatSteSta.conDat.dp_nominal,
     nSeg=nSeg,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     TGro_start = {T_start for i in 1:nSeg},
@@ -117,7 +115,6 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.TwoUTube borHol2UTubDyn(
     redeclare package Medium = Medium,
     dp_nominal=borFie2UTubDat.conDat.dp_nominal,
-    dynFil=true,
     m_flow_nominal=borFie2UTubDat.conDat.mBor_flow_nominal,
     borFieDat=borFie2UTubDat,
     nSeg=nSeg,
@@ -145,13 +142,11 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
     p=101330,
     T=283.15) "Sink" annotation (Placement(transformation(extent={{80,-70},{60,-50}},
                   rotation=0)));
-  parameter
-    IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example
-    borFie2UTubDat(conDat=
-        IBPSA.Fluid.Geothermal.Borefields.Data.Configuration.Example(
-         borCon=IBPSA.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel))
+  parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubDat(
+    conDat=IBPSA.Fluid.Geothermal.Borefields.Data.Configuration.Example(
+      borCon=IBPSA.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel))
     "Borefield parameters with UTube borehole configuration"
-    annotation (Placement(transformation(extent={{80,-100},{100,-80}})));
+    annotation (Placement(transformation(extent={{90,-80},{110,-60}})));
   IBPSA.Fluid.Sensors.TemperatureTwoPort TBorIn2(redeclare package Medium =
         Medium, m_flow_nominal=borFie2UTubDat.conDat.mBor_flow_nominal,
     tau=0)
@@ -171,10 +166,9 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
 
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.TwoUTube borHol2UTubSteSta(
     redeclare package Medium = Medium,
-    dp_nominal=borFie2UTubDat.conDat.dp_nominal,
-    dynFil=false,
-    m_flow_nominal=borFie2UTubDat.conDat.mBor_flow_nominal,
-    borFieDat=borFie2UTubDat,
+    dp_nominal=borFie2UTubDatSteSta.conDat.dp_nominal,
+    m_flow_nominal=borFie2UTubDatSteSta.conDat.mBor_flow_nominal,
+    borFieDat=borFie2UTubDatSteSta,
     nSeg=nSeg,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     TGro_start = {T_start for i in 1:nSeg},
@@ -230,6 +224,18 @@ model BoreholeDynamics "Example model for different borehole models and dynamics
   Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature
     prescribedTemperature3
     annotation (Placement(transformation(extent={{-70,-100},{-50,-80}})));
+  parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example borFieUTubDatSteSta(filDat=
+        IBPSA.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+        steadyState=true))
+    "Borefield parameters with UTube borehole configuration and steady-state filling"
+    annotation (Placement(transformation(extent={{90,0},{110,20}})));
+  parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubDatSteSta(
+    filDat=IBPSA.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+        steadyState=true),
+    conDat=IBPSA.Fluid.Geothermal.Borefields.Data.Configuration.Example(
+        borCon=IBPSA.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel))
+    "Borefield parameters with UTube borehole configuration and steady-state filling"
+    annotation (Placement(transformation(extent={{90,-120},{110,-100}})));
 equation
   connect(sou.ports[1],TBorIn. port_a)
     annotation (Line(points={{-48,60},{-40,60}},
@@ -301,6 +307,12 @@ and energy dynamics.
 </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 10, 2018, by Alex Laferri&egrave;re:<br/>
 Removed ground heat transfer models so the example focuses on the boreholes.
 </li>