Move borefield model

lbl-srg · Jan 8, 2024 · 8097276 · 8097276
1 parent 259f6a4
commit 8097276
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/...imental/DHC/Plants/Reservoir/BoreField.mo → ...xamples/Combined/BaseClasses/BoreField.mo b/...imental/DHC/Plants/Reservoir/BoreField.mo → ...xamples/Combined/BaseClasses/BoreField.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Reservoir;
+within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
 model BoreField "Geothermal borefield model"
   extends Buildings.Fluid.Geothermal.Borefields.TwoUTubes(
     final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -79,6 +79,11 @@ double U-tube parallel configuration.
 </html>", revisions="<html>
 <ul>
 <li>
+January 8, 2024, by David Blum:<br/>
+Moved to <code>Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField</code>.
+This is for xxxx.
+</li>
+<li>
 May 31, 2023, by Michael Wetter:<br/>
 Removed <code>final</code> modifier for <code>borFieDat</code> to allow record to be replaced
 in models that extend this model.

diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
@@ -22,8 +22,8 @@ partial model PartialSeries "Partial model for series network"
     datDes(final mCon_flow_nominal=bui.ets.mSerWat_flow_nominal) "Design data"
     annotation (Placement(transformation(extent={{-340,220},{-320,240}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.Plants.Reservoir.BoreField
-    borFie(redeclare final package Medium = Medium) "Bore field" annotation (
+  Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField borFie(
+      redeclare final package Medium = Medium) "Bore field" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,

diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order
@@ -1,2 +1,3 @@
+BoreField
 PartialSeries
 DesignDataSeries
diff --git a/Buildings/Experimental/DHC/Plants/Reservoir/package.order b/Buildings/Experimental/DHC/Plants/Reservoir/package.order
@@ -1 +0,0 @@
-BoreField

diff --git a/Buildings/Experimental/DHC/Plants/package.order b/Buildings/Experimental/DHC/Plants/package.order
@@ -1,6 +1,5 @@
 Combined
 Cooling
 Heating
-Reservoir
 Steam
 BaseClasses
diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos
@@ -45,3 +45,7 @@ convertClass("Buildings.Controls.OBC.CDL.Logical.ZeroCrossing",
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3596
 convertClass("Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime",
              "Buildings.Controls.OBC.CDL.Reals.Sources.CivilTime");
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/xxxx
+convertClass("Buildings.Experimental.DHC.Plants.Reservoir.Borefield",
+             "Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField");
diff --git a/Buildings/package.mo b/Buildings/package.mo
@@ -475,6 +475,14 @@ have been <b style=\"color:blue\">improved</b> in a
                      This change is supported in the conversion script.
     </td>
 </tr>
+<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Reservoir.Borefield
+    </td>
+    <td valign=\"top\">Moved to Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField
+                       <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField\">.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/xxxx\">#xxxx</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
     </td>
 </tr>