Issue3727 move dhc 2 (#3781)

* Reformulated InductiveLoad to avoid infinite value For #3776 * Updated release notes * buildingspy move from Buildings.Experimental.DHC to Buildings.DHC * Remove Experimental from package.order * Renamed EnergyTransferStations to ETS * Adding schematics to AirToWater (#3782) * Renamed BoreField to Borefield for consistency * Replaced BoreFieldType with BorefieldType for consistency --------- Co-authored-by: Michael Wetter <[email protected]> Co-authored-by: Remi Patureau <[email protected]>
lbl-srg · Apr 8, 2024 · 0e7afcf · 0e7afcf
1 parent 6740b53
commit 0e7afcf
Show file tree

Hide file tree

Showing 754 changed files with 3,111 additions and 2,181 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -68,15 +68,15 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Applications\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.Combined\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.Combined\" SINGLEPROC=\"true\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.Combined\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
@@ -165,7 +165,7 @@ install:
       export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
       pip3 install pandas==1.3.5;
     fi;
-  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
+  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
       echo "Installing Spawn binaries";
       Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
     fi;

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo
@@ -1129,7 +1129,7 @@ annotation (defaultComponentName="mulAHUFrePro",
         Text(
           extent={{-96,120},{-20,102}},
           textColor={0,0,127},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow,
           textString="uMinOutDam"),
         Text(
           extent={{-98,78},{-46,62}},
@@ -1178,7 +1178,7 @@ annotation (defaultComponentName="mulAHUFrePro",
         Text(
           extent={{20,122},{98,104}},
           textColor={0,0,127},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow,
           textString="yMinOutDam"),
         Text(
           extent={{50,50},{96,34}},
@@ -1237,11 +1237,11 @@ annotation (defaultComponentName="mulAHUFrePro",
           extent={{-96,104},{-14,80}},
           textColor={255,0,255},
           textString="u1MinOutDamPos",
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure),
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure),
         Text(
           extent={{16,102},{96,82}},
           textColor={255,0,255},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure,
           textString="y1MinOutDam"),
         Text(
           extent={{-96,-16},{-46,-40}},
@@ -1354,6 +1354,10 @@ shall be no software reset switch.)
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 September 18, 2023, by Jianjun Hu:<br/>
 Added 2-position relief damper position output.<br/>
 This is for

diff --git a/...ngs/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo b/...ngs/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
@@ -219,15 +219,15 @@ annotation (
         Text(
           extent={{-96,-72},{-50,-88}},
           textColor={0,0,0},
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper),
           textString="VAirOut_flow"),
         Text(
           extent={{30,-70},{98,-86}},
           textColor={0,0,0},
           textString="outAir_normalized",
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper))}),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper))}),
 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,-120},{220,120}})),
 Documentation(info="<html>
 <p>
@@ -298,6 +298,10 @@ but no larger than the design total outdoor airflow rate <code>VDesTotOutAir_flo
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 March 12, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo
@@ -240,13 +240,13 @@ annotation (
           extent={{30,-76},{96,-100}},
           textColor={0,0,0},
           textString="outAir_normalized",
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper)),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper)),
         Text(
           extent={{-98,-74},{-54,-88}},
           textColor={0,0,0},
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper),
           textString="VAirOut_flow")}),
 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-200},{100,200}})),
 Documentation(info="<html>
@@ -299,6 +299,10 @@ outdoor airflow setpoint should be equal to the <code>VEffDesOutAir_flow</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 March 12, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>

diff --git a/...es/Steam/PartialSaturatedControlVolume.mo → ...es/Steam/PartialSaturatedControlVolume.mo b/...es/Steam/PartialSaturatedControlVolume.mo → ...es/Steam/PartialSaturatedControlVolume.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.BaseClasses.Steam;
+within Buildings.DHC.BaseClasses.Steam;
 partial model PartialSaturatedControlVolume
   "Partial control volume for evaporation/condensation processes"
   extends Buildings.BaseClasses.BaseIcon;
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
+  extends Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
     p_start=MediumSte.p_default,
     final T_start=MediumSte.saturationTemperature(p_start));
 
@@ -285,10 +285,10 @@ liquid or saturated vapor.
 </ul>
 <p>
 Models that extend this base class include
-<a href = \"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a> and
-<a href = \"modelica://Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation\">
-Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation</a>.
+<a href = \"modelica://Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
+Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a> and
+<a href = \"modelica://Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation\">
+Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation</a>.
 </p>
 
 <h4>Reference</h4>

diff --git a/...eClasses/Steam/PartialTwoPortTwoMedium.mo → ...eClasses/Steam/PartialTwoPortTwoMedium.mo b/...eClasses/Steam/PartialTwoPortTwoMedium.mo → ...eClasses/Steam/PartialTwoPortTwoMedium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.BaseClasses.Steam;
+within Buildings.DHC.BaseClasses.Steam;
 partial model PartialTwoPortTwoMedium
   "Partial model with two ports with two separate medium models without storing mass or energy"
 

diff --git a/...rimental/DHC/BaseClasses/Steam/package.mo → Buildings/DHC/BaseClasses/Steam/package.mo b/...rimental/DHC/BaseClasses/Steam/package.mo → Buildings/DHC/BaseClasses/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.BaseClasses;
+within Buildings.DHC.BaseClasses;
 package Steam "Package for steam systems using the split-medium approach."
   extends Modelica.Icons.VariantsPackage;
 

diff --git a/...ental/DHC/BaseClasses/Steam/package.order → ...dings/DHC/BaseClasses/Steam/package.order b/...ental/DHC/BaseClasses/Steam/package.order → ...dings/DHC/BaseClasses/Steam/package.order
diff --git a/...s/Experimental/DHC/BaseClasses/package.mo → Buildings/DHC/BaseClasses/package.mo b/...s/Experimental/DHC/BaseClasses/package.mo → Buildings/DHC/BaseClasses/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC"
+within Buildings.DHC;
+package BaseClasses "Package with base classes for Buildings.DHC"
   extends Modelica.Icons.BasesPackage;
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the models in
-<a href=\"modelica://Buildings.Experimental.DHC\">
-Buildings.Experimental.DHC</a>.
+<a href=\"modelica://Buildings.DHC\">
+Buildings.DHC</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/...xperimental/DHC/BaseClasses/package.order → Buildings/DHC/BaseClasses/package.order b/...xperimental/DHC/BaseClasses/package.order → Buildings/DHC/BaseClasses/package.order
diff --git a/...tions/BaseClasses/CollectorDistributor.mo → ...C/ETS/BaseClasses/CollectorDistributor.mo b/...tions/BaseClasses/CollectorDistributor.mo → ...C/ETS/BaseClasses/CollectorDistributor.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model CollectorDistributor
   "Model of a collector/distributor with zero pressure drop between connections"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
     mDis_flow_nominal=sum(
       mCon_flow_nominal),
     final mDisCon_flow_nominal=fill(

diff --git a/...ns/BaseClasses/Connection2PipeLossless.mo → ...TS/BaseClasses/Connection2PipeLossless.mo b/...ns/BaseClasses/Connection2PipeLossless.mo → ...TS/BaseClasses/Connection2PipeLossless.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Connection2PipeLossless
   "Model of a lossless connection to a collector/distributor"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     redeclare model Model_pipDisSup =
         Buildings.Fluid.FixedResistances.LosslessPipe,
     redeclare model Model_pipDisRet =

diff --git a/...yTransferStations/BaseClasses/Junction.mo → Buildings/DHC/ETS/BaseClasses/Junction.mo b/...yTransferStations/BaseClasses/Junction.mo → Buildings/DHC/ETS/BaseClasses/Junction.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Junction
   "Fluid junction with zero pressure drop"
   extends Fluid.FixedResistances.Junction(

diff --git a/...sferStations/BaseClasses/PartialDirect.mo → ...ings/DHC/ETS/BaseClasses/PartialDirect.mo b/...sferStations/BaseClasses/PartialDirect.mo → ...ings/DHC/ETS/BaseClasses/PartialDirect.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model PartialDirect
   "Partial direct ETS model for district energy systems with in-building pumping and deltaT control"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
     final have_weaBus=false,
     final have_hotWat=false,
     final have_eleHea=false,
@@ -218,7 +218,7 @@ cooling network is at or above the minimum specified value. This configuration
 naturally results in a fluctuating building supply tempearture.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
 </p>
 <h4>
 Reference