diff --git a/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
index ef9d105832e..00d7f68371e 100644
--- a/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
@@ -7,7 +7,6 @@ model Borefield "Geothermal borefield model"
     TExt0_start=282.55,
     final z0=10,
     final dT_dz=0.02,
-    final dynFil=true,
     borFieDat(
       filDat=Buildings.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
           kFil=2.0,
@@ -79,6 +78,12 @@ double U-tube parallel configuration.
 </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 8, 2024, by David Blum:<br/>
 Moved to <code>Buildings.DHC.Examples.Combined.BaseClasses.Borefield</code>.
 This is for
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo
index aaec12fccb3..71b34022192 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo
+++ b/Buildings/Fluid/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
index d7b6e146bcc..628614ba2e1 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
@@ -56,7 +56,6 @@ public
 
   Buildings.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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
index a6b23fbb9d0..2993516e9c9 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
+++ b/Buildings/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo
index 7fd6e8f2339..e4714f73489 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo
+++ b/Buildings/Fluid/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo
index b19fde0b1a6..02e2e4daa7e 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo
+++ b/Buildings/Fluid/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,7 +93,7 @@ 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,
@@ -100,13 +101,13 @@ model InternalResistancesTwoUTube
   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,
@@ -114,7 +115,7 @@ model InternalResistancesTwoUTube
   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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo
index b4f98b77adb..367e95ba5f1 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo
+++ b/Buildings/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo
index 7ecd91a60f3..cc917ab8a83 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo
+++ b/Buildings/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo
index 1e96ced207d..1e0315ebea5 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo
+++ b/Buildings/Fluid/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/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo
index a8a456eddc8..d07be57bcef 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo
+++ b/Buildings/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
     Buildings.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}})));
   Buildings.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})));
   Buildings.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
   Buildings.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
-    Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example
-    borFie2UTubDat(conDat=
-        Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
-         borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel))
+  parameter Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubDat(
+    conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
+      borCon=Buildings.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}})));
   Buildings.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
 
   Buildings.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
   Buildings.HeatTransfer.Sources.PrescribedTemperature
     prescribedTemperature3
     annotation (Placement(transformation(extent={{-70,-100},{-50,-80}})));
+  parameter Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFieUTubDatSteSta(filDat=
+        Buildings.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 Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubDatSteSta(
+    filDat=Buildings.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+        steadyState=true),
+    conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
+        borCon=Buildings.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>
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo
index 7ed1d460aea..7fc7b0ae0ae 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo
@@ -13,7 +13,6 @@ model OneUTube "Single U-tube borehole heat exchanger"
     each final deltaM1=deltaM,
     each final deltaM2=deltaM,
     each final energyDynamics=energyDynamics,
-    each final dynFil=dynFil,
     each final mSenFac=mSenFac,
     final dp1_nominal={if i == 1 then dp_nominal else 0 for i in 1:nSeg},
     each final dp2_nominal=0,
@@ -91,11 +90,11 @@ equation
           textString="")}),
     Documentation(info="<html>
 <p>
-Model of a single U-tube borehole heat exchanger. 
+Model of a single U-tube borehole heat exchanger.
 The borehole heat exchanger is vertically discretized into
 <i>n<sub>seg</sub></i> elements of height
 <i>h=h<sub>Bor</sub>&frasl;n<sub>seg</sub></i>.
-Each segment contains a model for the heat transfer in the borehole, 
+Each segment contains a model for the heat transfer in the borehole,
 with a uniform borehole wall boundary temperature given by the
 <code>port_wall</code> port.
 </p>
@@ -109,6 +108,12 @@ into account. The vertical heat flow is assumed to be zero.
 </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 2018, by Alex Laferri&egrave;re:<br/>
 Following major changes to the structure of the Buildings.Fluid.HeatExchangers.Ground package,
 the documentation has been changed to reflect the new role of this model.
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo
index 96d7a9685c2..6b5ee9ada85 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo
@@ -33,7 +33,6 @@ model TwoUTube "Double U-tube borehole heat exchanger"
          then borFieDat.conDat.mBor_flow_small/2 else borFieDat.conDat.mBor_flow_small,
     each final m4_flow_small=if borFieDat.conDat.borCon == Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel
          then borFieDat.conDat.mBor_flow_small/2 else borFieDat.conDat.mBor_flow_small,
-    each final dynFil=dynFil,
     each final mSenFac=mSenFac,
     each final allowFlowReversal1=allowFlowReversal,
     each final allowFlowReversal2=allowFlowReversal,
@@ -174,11 +173,11 @@ equation
           textString="")}),
     Documentation(info="<html>
 <p>
-Model of a double U-tube borehole heat exchanger. 
+Model of a double U-tube borehole heat exchanger.
 The borehole heat exchanger is vertically discretized into
 <i>n<sub>seg</sub></i> elements of height
 <i>h=h<sub>Bor</sub>&frasl;n<sub>seg</sub></i>.
-Each segment contains a model for the heat transfer in the borehole, 
+Each segment contains a model for the heat transfer in the borehole,
 with a uniform borehole wall boundary temperature given by the
 <code>port_wall</code> port.
 </p>
@@ -187,11 +186,17 @@ The heat transfer in the borehole is computed using a convective heat transfer
 coefficient that depends on the fluid velocity, a heat resistance between each
 pair of pipes, and a heat resistance between the pipes and the borehole wall.
 The heat capacity of the fluid and the heat capacity of the grout are taken
-into account. The vertical heat flow is assumed to be zero. 
+into account. The vertical heat flow is assumed to be zero.
 </p>
 </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 2018, by Alex Laferri&egrave;re:<br/>
 Following major changes to the structure of the Buildings.Fluid.HeatExchangers.Ground package,
 the documentation has been changed to reflect the new role of this model.
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
index 9311b212466..5f07523ceeb 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
@@ -73,11 +73,6 @@ partial model PartialBorefield
     "Vertical temperature gradient of the undisturbed soil for h below z0"
     annotation (Dialog(tab="Initialization", group="Temperature profile"));
 
-  // Dynamics of filling material
-  parameter Boolean dynFil=true
-    "Set to false to remove the dynamics of the filling material."
-    annotation (Dialog(tab="Dynamics"));
-
   Modelica.Blocks.Interfaces.RealOutput TBorAve(final quantity="ThermodynamicTemperature",
                                                 final unit="K",
                                                 displayUnit = "degC",
@@ -112,7 +107,6 @@ partial model PartialBorefield
     final energyDynamics=energyDynamics,
     final p_start=p_start,
     final mSenFac=mSenFac,
-    final dynFil=dynFil,
     final TFlu_start=TFlu_start,
     final TGro_start=TGro_start) "Borehole"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
diff --git a/Buildings/Fluid/Geothermal/Borefields/Examples/Borefields.mo b/Buildings/Fluid/Geothermal/Borefields/Examples/Borefields.mo
index 244d1d87058..a814803b1a1 100644
--- a/Buildings/Fluid/Geothermal/Borefields/Examples/Borefields.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/Examples/Borefields.mo
@@ -13,7 +13,6 @@ model Borefields
     redeclare package Medium = Medium,
     borFieDat=borFie2UTubParDat,
     tLoaAgg=tLoaAgg,
-    dynFil=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     TExt0_start=TGro)
     "Borefield with a 2-U-tube connected in parallel borehole configuration"
@@ -46,6 +45,8 @@ model Borefields
     "Outlet temperature of the borefield with 2-UTube in parallel configuration"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
   parameter Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFieUTubDat(
+    filDat=Buildings.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+    steadyState=true),
     conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
     borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.SingleUTube))
     annotation (Placement(transformation(extent={{70,-100},{90,-80}})));
@@ -54,7 +55,6 @@ model Borefields
     redeclare package Medium = Medium,
     borFieDat=borFie2UTubSerDat,
     tLoaAgg=tLoaAgg,
-    dynFil=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     TExt0_start=TGro)
     "Borefield with a 2-U-tube connected in serie borehole configuration"
@@ -88,6 +88,8 @@ model Borefields
     "Outlet temperature of the borefield with 2-UTube in serie configuration"
     annotation (Placement(transformation(extent={{42,50},{62,70}})));
   parameter Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubParDat(
+    filDat=Buildings.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+    steadyState=true),
     conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
     borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel))
     "Data from the borefield with 2-UTube in parallel borehole configuration"
@@ -96,7 +98,6 @@ model Borefields
     redeclare package Medium = Medium,
     borFieDat=borFieUTubDat,
     tLoaAgg=tLoaAgg,
-    dynFil=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     TExt0_start=TGro)
     "Borefield with a U-tube borehole configuration"
@@ -129,6 +130,8 @@ model Borefields
     "Inlet temperature of the borefield with UTube configuration"
     annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
   parameter Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example borFie2UTubSerDat(
+      filDat=Buildings.Fluid.Geothermal.Borefields.Data.Filling.Bentonite(
+        steadyState=true),
     conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
     borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeSeries))
     "Data from the borefield with 2-UTube in serie borehole configuration"
@@ -171,6 +174,12 @@ the thermal behaviour of the circulating fluid in each case.
 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>
 April 8, 2021, by Michael Wetter:<br/>
 Added missing <code>parameter</code> keyword.<br/>
 For <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1464\">IBPSA, issue 1464</a>.
diff --git a/Buildings/Fluid/Geothermal/Borefields/UsersGuide.mo b/Buildings/Fluid/Geothermal/Borefields/UsersGuide.mo
index b12f499922b..622223b72f2 100644
--- a/Buildings/Fluid/Geothermal/Borefields/UsersGuide.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/UsersGuide.mo
@@ -131,7 +131,8 @@ Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.GroundTemperature
 Other parameters which can be modified include the dynamics, initial conditions,
 and further information regarding the fluid flow, for example whether the flow is reversible.
 It is worth noting that regardless of the <code>energyDynamics</code> chosen,
-the <code>dynFil</code> parameter can be set to <code>false</code>
+the <code>steadyState</code> parameter can be set to <code>true</code>
+in the data record for the filling material
 to remove the effect of the thermal capacitance
 of the filling material in the borehole(s).
 The <code>nSeg</code> parameter specifies the number of segments for the vertical discretization of the borehole(s).
@@ -178,7 +179,8 @@ short-term thermal effects in the borehole. The borehole segments do not take in
 thus only radial (horizontal) effects are considered within the borehole(s). The thermal
 behavior between the pipes and borehole wall are modeled as a resistance-capacitance network, with
 the grout capacitance being split in the number of pipes present in a borehole section.
-The capacitance is only present if the <code>dynFil</code> parameter is set to <code>true</code>.
+The capacitance is only present if the parameter <code>steadyState</code> of the filling
+material data record is <code>false</code>, which is the default setting.
 The figure below shows an example for a borehole section within a single U-tube configuration.
 </p>
 <p align=\"center\">
diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
index acd1174fd04..975a28f6039 100644
--- a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
+++ b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
@@ -12,3 +12,11 @@ convertClass("Buildings.Templates.Plants.Controls.Utilities.SortWithIndices",
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3604
 convertClass("Buildings.Fluid.SolarCollectors",
              "Buildings.Obsolete.Fluid.SolarCollectors");
+
+// Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1885
+convertModifiers("Buildings.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield",
+                {"dynFil"}, fill("",0), true);
+convertModifiers("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube",
+                {"dynFil"}, fill("",0), true);
+convertModifiers("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.TwoUTube",
+                {"dynFil"}, fill("",0), true);
\ No newline at end of file
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
index 5aae79115bc..ad9756c489c 100644
--- a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
@@ -71,7 +71,22 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube<br/>
+                       Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.TwoUTube<br/>
+                       Buildings.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield
+
+    </td>
+    <td valign=\"top\">Removed parameter <code>dynFil</code> to avoid allowing an inconsistent
+                       declaration of the energy balance configuration for the borehole filling.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1885\">IBPSA, #1885</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
     </td>
 </tr>
 <tr>

Buildings.Fluid +
Buildings.Fluid.Geothermal +
Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube + Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.TwoUTube + Buildings.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield + +	Removed parameter `dynFil` to avoid allowing an inconsistent + declaration of the energy balance configuration for the borehole filling. + This is for + IBPSA, #1885. +
Buildings.Fluid.SolarCollectors